Cmake: Add src/ to include_directories, fix missing includes for file checks

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 026fa5d01570bba9834fd3a05728aa32bf940501..749c3c534bd2b9ea48e3cf0640f3dc3b0337a331 100644 (file)
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -1,7 +1,7 @@
 #---------------\r
 # From here on:\r
 # Set all HAVE_XXX variables, to correctly set all defines in config.h\r
-\r
+SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES})\r
 INCLUDE (CheckIncludeFiles)\r
 INCLUDE (CheckFunctionExists)\r
 INCLUDE (CheckStructMember)\r

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 1a690abd309ec50295f5fca00cf659eb9f035e0a..7b09ed8f3cf94954734ef57c68d12ef3781835ce 100644 (file)
--- 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)\r
 INCLUDE(ConfigChecks)