Cmake: added more Platform File Checks

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b8806b6eb14bf8d76eaaa357f8576f2f1214b87..65cc2d4ac2844ef50b4769be54569335761ebbf1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
 INCLUDE(ConfigInkscapeDepends)\r
 
 SET(CONFIG_H
-../config.h)\r
+"${CMAKE_CURRENT_BINARY_DIR}/config.h")\r
 INCLUDE_DIRECTORIES (src/)\r
 LINK_DIRECTORIES (src/)\r
 \r

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 25b0eda307348093901a25b733463a1999b89a0a..1160b856dc571b7c42083193cbd7abafd8c07853 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -57,5 +57,26 @@ INCLUDE (CheckIncludeFiles)
 # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> )
 
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
-#CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
-#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+CHECK_INCLUDE_FILES (boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)
+CHECK_INCLUDE_FILES (gc/gc.h HAVE_GC_GC_H)
+CHECK_INCLUDE_FILES (gc.h HAVE_GC_H)
+CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
+CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILES (locale.h HAVE_LC_MESSAGES)
+CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H)
+CHECK_INCLUDE_FILES (libintl.h HAVE_LIBINTL_H)
+CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
+CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
+CHECK_INCLUDE_FILES (stddef.h HAVE_STDDEF_H)
+CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILES (sys/filio.h HAVE_SYS_FILIO_H)
+CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES (zlib.h HAVE_ZLIB_H)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index caeb1483e99e945e0dbdb3777bf40fea5eca895b..000f26b3d5471a2755fd58730d6379ed9382e86d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 SET(INKSCAPE_SRC
-#${CONFIG_H}
+${CONFIG_H}
 arc-context.cpp
 attributes.cpp
 axis-manip.cpp