From: verbalshadow Date: Wed, 18 Jun 2008 19:31:57 +0000 (+0000) Subject: Cmake: Add src/ to include_directories, fix missing includes for file checks X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e73f0453347f368e991f2786425eb1f65aeabd80;p=inkscape.git Cmake: Add src/ to include_directories, fix missing includes for file checks --- diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 026fa5d01..749c3c534 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -1,7 +1,7 @@ #--------------- # From here on: # Set all HAVE_XXX variables, to correctly set all defines in config.h - +SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES}) INCLUDE (CheckIncludeFiles) INCLUDE (CheckFunctionExists) INCLUDE (CheckStructMember) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 1a690abd3..7b09ed8f3 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -36,9 +36,10 @@ LIST(APPEND INKSCAPE_LIBS ) #Includes -INCLUDE_DIRECTORIES( +SET(INK_INCLUDES ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR} +${PROJECT_SOURCE_DIR}/src ${GTK2_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${SIGC++_INCLUDE_DIRS} @@ -54,7 +55,7 @@ ${POPT_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ) #C/C++ Flags -#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ") +INCLUDE_DIRECTORIES(${INK_INCLUDES}) #INCLUDE(ConfigCompileFlags) INCLUDE(ConfigChecks)