diff options
| author | houz <houz@gmx.de> | 2015-05-02 10:39:03 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-05-02 10:39:03 +0000 |
| commit | daa49de4de9aecd929913de4677bccd105bbf628 (patch) | |
| tree | d5b7aaec2210096303ce64322d9da35db67d08ed /CMakeScripts | |
| parent | cmake: enable Image Magick++ support for bitmap effects (diff) | |
| download | inkscape-daa49de4de9aecd929913de4677bccd105bbf628.tar.gz inkscape-daa49de4de9aecd929913de4677bccd105bbf628.zip | |
cmake: fix failing checks due to missing include and library paths (e.g. for gtk_window_fullscreen)
(bzr r14091)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 3 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 5f76e01e9..905465448 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -9,6 +9,9 @@ include(CheckStructHasMember) # usage: CHECK_FUNCTION_EXISTS (<function name> <RESULT_VARIABLE> ) # usage: CHECK_STRUCT_HAS_MEMBER (<struct> <member> <header> <RESULT_VARIABLE>) +set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS}) +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS}) + CHECK_INCLUDE_FILES(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d9c0977e1..27802ad92 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -311,7 +311,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake) include_directories(${INKSCAPE_INCS}) include_directories(SYSTEM ${INKSCAPE_INCS_SYS}) +include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake) + unset(INKSCAPE_INCS) unset(INKSCAPE_INCS_SYS) - -include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake) |