[poppler] 7 commits - CMakeLists.txt cmake/modules cpp/tests qt/poppler-page.cc
Pino Toscano
pino at kemper.freedesktop.org
Mon Mar 22 14:17:31 PDT 2010
CMakeLists.txt | 7 +++++++
cmake/modules/PopplerMacros.cmake | 15 +++++++--------
cpp/tests/CMakeLists.txt | 4 ----
qt/poppler-page.cc | 1 +
4 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 0ec21cae0b4623644c3efca1d2836a9f38f25737
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 22:11:04 2010 +0100
[Qt] add the unhandled cases for 'actionOCGState'
diff --git a/qt/poppler-page.cc b/qt/poppler-page.cc
index 50c28aa..e6b4178 100644
--- a/qt/poppler-page.cc
+++ b/qt/poppler-page.cc
@@ -339,6 +339,7 @@ QValueList<Link*> Page::links() const
case actionSound:
case actionRendition:
case actionJavaScript:
+ case actionOCGState:
break;
case actionUnknown:
commit 5211e09595135b8e6c68efd1b8b689b518092b84
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 22:07:44 2010 +0100
[CMake/cpp] move the BUILD_CPP_TESTS option to the main CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f995e7..25fc9a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
option(BUILD_QT3_TESTS "Whether compile the Qt3 test programs." ON)
option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
+option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
option(ENABLE_UTILS "Compile poppler command line utils." ON)
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
index a083afd..b65c55c 100644
--- a/cpp/tests/CMakeLists.txt
+++ b/cpp/tests/CMakeLists.txt
@@ -5,9 +5,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/utils
)
-# ### temporary
-set(BUILD_CPP_TESTS TRUE)
-
macro(CPP_ADD_SIMPLETEST exe)
string(REPLACE "-" "" test_name ${exe})
set(${test_name}_SOURCES
commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 22:00:55 2010 +0100
no more needed
diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
index e07531a..a083afd 100644
--- a/cpp/tests/CMakeLists.txt
+++ b/cpp/tests/CMakeLists.txt
@@ -22,4 +22,3 @@ endmacro(CPP_ADD_SIMPLETEST)
cpp_add_simpletest(poppler-dump poppler-dump.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.c)
-target_link_libraries(poppler-dump poppler)
commit a07ef8f703ab896f89ed211a5780e4a669b04fc7
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 22:00:15 2010 +0100
[CMake] revert addition of "-Wl,--no-add-needed" to the link flags, if available
for now it is safer without it
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index fad5152..befd20a 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -127,12 +127,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
endif(GCC_HAS_AS_NEEDED)
- poppler_check_link_flag("-Wl,--no-add-needed" GCC_HAS_NO_ADD_NEEDED)
- if(GCC_HAS_NO_ADD_NEEDED)
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-add-needed")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed")
- endif(GCC_HAS_NO_ADD_NEEDED)
endif (CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_C_COMPILER MATCHES "icc")
commit 86debcc9bba28a7c86f01ca9e63bde5fcd541846
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 21:49:22 2010 +0100
[CMake] add "-ansi" to the CXXFLAGS only on Linux
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index 3651562..fad5152 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -101,8 +101,8 @@ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
if(CMAKE_COMPILER_IS_GNUCXX)
# set the default compile warnings
set(DEFAULT_COMPILE_WARNINGS_NO)
- set(DEFAULT_COMPILE_WARNINGS_YES "-ansi -Wall -Wno-write-strings")
- set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings")
+ set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
set(CMAKE_CXX_FLAGS "-Wnon-virtual-dtor -Woverloaded-virtual")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -116,6 +116,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ if(CMAKE_SYSTEM_NAME MATCHES Linux)
+ set(DEFAULT_COMPILE_WARNINGS_YES "${DEFAULT_COMPILE_WARNINGS_YES} -ansi")
+ set(DEFAULT_COMPILE_WARNINGS_KDE "${DEFAULT_COMPILE_WARNINGS_KDE} -ansi")
+ endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+
poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
if(GCC_HAS_AS_NEEDED)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
commit 0819acd52a2ce74f0e176626d7b2233e10232d53
Merge: c4ddbe8... 92738eb...
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 22 21:43:01 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/poppler/poppler
commit c4ddbe89df9e48343a9606728b7c182080d87ece
Author: Patrick Spendrin <ps_ml at gmx.de>
Date: Sat Mar 20 21:55:17 2010 +0100
[CMake] when the conf configuration backend is "win32", set the required Internet Explorer version to 5.0
... as done with autotools as well
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ca288a..6f995e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,12 @@ add_definitions(-DHAVE_CONFIG_H=1)
if(FONTCONFIG_FOUND)
add_definitions(${FONTCONFIG_DEFINITIONS})
endif(FONTCONFIG_FOUND)
+if(WITH_FONTCONFIGURATION_WIN32)
+ if(MINGW)
+ # Set the minimum required Internet Explorer version to 5.0
+ add_definitions(-D_WIN32_IE=0x0500)
+ endif(MINGW)
+endif(WITH_FONTCONFIGURATION_WIN32)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/fofi
More information about the poppler
mailing list