cmake: inkscape source dirs were included using system setting

(bzr r10336)

2 files changed, 28 insertions, 21 deletions

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 097dc888e..a04cf2698 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -66,5 +66,5 @@ endif()
 

 # Create the two configuration files: config.h and inkscape_version.h

 # Create them in the binary root dir

-configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)

+configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)

 add_definitions(-DHAVE_CONFIG_H)

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d0fcaa6da..99831fc34 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,38 +1,42 @@
 
-set(INKSCAPE_INCS
-	${CMAKE_BINARY_DIR}
+set(INKSCAPE_LIBS "")
+set(INKSCAPE_INCS "")
+set(INKSCAPE_INCS_SYS "")
+
+list(APPEND INKSCAPE_INCS
 	${PROJECT_SOURCE_DIR}
 	${PROJECT_SOURCE_DIR}/src
-)
 
-set(INKSCAPE_LIBS "")
+	# generated includes
+	${CMAKE_BINARY_DIR}/include
+)
 
 # ----------------------------------------------------------------------------
 # Files we include
 # ----------------------------------------------------------------------------
 
 find_package(GSL REQUIRED)
-list(APPEND INKSCAPE_INCS ${GSL_INCLUDE_DIRS})
+list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES})
 list(APPEND INKSCAPE_LIBS "-lgslcblas")  # FIXME
 
 find_package(GnomeVFS2)
-list(APPEND INKSCAPE_INCS ${GNOMEVFS2_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY})
 
 find_package(BoehmGC REQUIRED)
-list(APPEND INKSCAPE_INCS ${BOEHMGC_INCLUDE_DIRS})
+list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES})
 add_definitions(${BOEHMGC_DEFINITIONS})
 
 find_package(LibWPG)
 
 find_package(PNG REQUIRED)
-list(APPEND INKSCAPE_INCS ${PNG_PNG_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${PNG_PNG_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${PNG_LIBRARY})
 
 find_package(Popt REQUIRED)
-list(APPEND INKSCAPE_INCS ${POPT_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${POPT_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${POPT_LIBRARIES})
 add_definitions(${POPT_DEFINITIONS})
 
@@ -42,7 +46,7 @@ add_definitions(${POPT_DEFINITIONS})
 
 # Include dependencies:
 find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
-list(APPEND INKSCAPE_INCS
+list(APPEND INKSCAPE_INCS_SYS
 	${GTK2_GDK_INCLUDE_DIR}
 	${GTK2_GDKMM_INCLUDE_DIR}
 	${GTK2_GDK_PIXBUF_INCLUDE_DIR}
@@ -87,34 +91,34 @@ list(APPEND INKSCAPE_LIBS
 
 ## XXX, we need a way to get this properly
 # pkg-config gtkmm-2.4 --cflags-only-I
-list(APPEND INKSCAPE_INCS
+list(APPEND INKSCAPE_INCS_SYS
 	"/usr/lib/cairomm-1.0/include"
 )
 
 find_package(Freetype REQUIRED)
-list(APPEND INKSCAPE_INCS ${FREETYPE_INCLUDE_DIRS})
+list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES})
 
 find_package(Boost REQUIRED)
-list(APPEND INKSCAPE_INCS ${Boost_INCLUDE_DIRS})
+list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS})
 # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES})
 
 find_package(ASPELL)
-list(APPEND INKSCAPE_INCS ${ASPELL_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${ASPELL_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${ASPELL_LIBRARIES})
 add_definitions(${ASPELL_DEFINITIONS})
 
 find_package(OpenSSL)
-list(APPEND INKSCAPE_INCS ${OPENSSL_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES})
 
 find_package(LibXslt REQUIRED)
-list(APPEND INKSCAPE_INCS ${LIBXSLT_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${LIBXSLT_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${LIBXSLT_LIBRARIES})
 add_definitions(${LIBXSLT_DEFINITIONS})
 
 find_package(LibXml2 REQUIRED)
-list(APPEND INKSCAPE_INCS ${LIBXML2_INCLUDE_DIR})
+list(APPEND INKSCAPE_INCS_SYS ${LIBXML2_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${LIBXML2_LIBRARIES})
 add_definitions(${LIBXML2_DEFINITIONS})
 
@@ -130,12 +134,12 @@ if(OpenMP_FOUND)
 endif()
 
 find_package(ZLIB REQUIRED)
-list(APPEND INKSCAPE_INCS ${ZLIB_INCLUDE_DIRS})
+list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})
 
 find_package(ImageMagick COMPONENTS MagickCore Magick++)
 if(ImageMagick_FOUND)
-	list(APPEND INKSCAPE_INCS ${ImageMagick_MagickCore_INCLUDE_DIR})
+	list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_MagickCore_INCLUDE_DIR})
 	list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY})
 endif()
 
@@ -144,7 +148,10 @@ include(IncludeJava)
 
 
 # C/C++ Flags
-include_directories(SYSTEM ${INKSCAPE_INCS})
+include_directories(${INKSCAPE_INCS})
+include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
+
 unset(INKSCAPE_INCS)
+unset(INKSCAPE_INCS_SYS)
 
 include(ConfigChecks)