summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2012-02-06 01:18:25 +0100
committerAlbert Astals Cid <aacid@kde.org>2012-02-06 01:18:25 +0100
commitea6bc19564865e04431d9154802ae7fba975a716 (patch)
tree1d6080515cbde2695a0406e44a9faff5baef499a /cmake
parente17f09563276ee25b6acfc127b6ea360da650030 (diff)
parent92ce79f47f929392f48737612a9690088573f63d (diff)
Merge branch 'master' into xpdf303merge
Conflicts: poppler/CairoOutputDev.cc poppler/CairoOutputDev.h poppler/FontInfo.cc poppler/GfxFont.cc poppler/GfxState.cc poppler/GlobalParams.cc poppler/GlobalParams.h poppler/Lexer.cc
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindLIBOPENJPEG.cmake13
-rw-r--r--cmake/modules/GObjectIntrospectionMacros.cmake2
2 files changed, 15 insertions, 0 deletions
diff --git a/cmake/modules/FindLIBOPENJPEG.cmake b/cmake/modules/FindLIBOPENJPEG.cmake
index 978ee7d9..ab1721d9 100644
--- a/cmake/modules/FindLIBOPENJPEG.cmake
+++ b/cmake/modules/FindLIBOPENJPEG.cmake
@@ -26,6 +26,19 @@ else (LIBOPENJPEG_LIBRARIES AND LIBOPENJPEG_INCLUDE_DIR)
find_path (LIBOPENJPEG_INCLUDE_DIR openjpeg.h PATH_SUFFIXES openjpeg)
find_library(LIBOPENJPEG_LIBRARIES openjpeg)
if(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES)
+
+ set(CMAKE_REQUIRED_INCLUDES ${LIBOPENJPEG_INCLUDE_DIR})
+ set(CMAKE_REQUIRED_LIBRARIES ${LIBOPENJPEG_LIBRARIES})
+
+check_cxx_source_compiles("
+#include <openjpeg.h>
+int main()
+{
+ int foo = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+ return 0;
+}
+" WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG)
+
set(LIBOPENJPEG_FOUND TRUE)
endif(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES)
diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake
index e7d62a39..3f90c2a0 100644
--- a/cmake/modules/GObjectIntrospectionMacros.cmake
+++ b/cmake/modules/GObjectIntrospectionMacros.cmake
@@ -45,6 +45,7 @@ macro(gir_add_introspections introspections_girs)
_gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=")
_gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=")
_gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=")
+ _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=")
# Reuse the LIBTOOL variable from by automake if it's set
set(_gir_libtool "--no-libtool")
@@ -59,6 +60,7 @@ macro(gir_add_introspections introspections_girs)
${_gir_libraries}
${_gir_packages}
${_gir_includes}
+ ${_gir_export_packages}
${${_gir_name}_SCANNERFLAGS}
${${_gir_name}_CFLAGS}
${${_gir_name}_FILES}