Cmake: Start of Platform Checks

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21f28763b7fb69381940fd56c04c7400769952ed..8b8806b6eb14bf8d76eaaa357f8576f2f1214b87 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,9 @@ SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
 INCLUDE(ConfigInkscapeDepends)\r
-\r
+
+SET(CONFIG_H
+../config.h)\r
 INCLUDE_DIRECTORIES (src/)\r
 LINK_DIRECTORIES (src/)\r
 \r

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index de7494b73e3e490e13e7c2a9928d9883dffec465..25b0eda307348093901a25b733463a1999b89a0a 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -52,9 +52,10 @@ message(STATUS "")
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
+
 INCLUDE (CheckIncludeFiles)
 # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> )
 
-#CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
+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)

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