diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-03-31 17:50:55 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-03-31 17:50:55 +0000 |
| commit | a62c2064e53440012d92f5286dae6c56c3e6762a (patch) | |
| tree | daafe11c22169a8cb6cb5e3c0bfa099b6517b3a1 | |
| parent | Change INKSCAPE_JAVADIR to INKSCAPE_BINDDIR so that we can have subdirs for e... (diff) | |
| download | inkscape-a62c2064e53440012d92f5286dae6c56c3e6762a.tar.gz inkscape-a62c2064e53440012d92f5286dae6c56c3e6762a.zip | |
Cmake: Start of Platform Checks
(bzr r5269)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeScripts/ConfigInkscapeDepends.cmake | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f28763b..8b8806b6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,9 @@ SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) SET(CMAKE_SKIP_RPATH:BOOL OFF)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
INCLUDE(ConfigInkscapeDepends)
-
+ +SET(CONFIG_H +../config.h)
INCLUDE_DIRECTORIES (src/)
LINK_DIRECTORIES (src/)
diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake index de7494b73..25b0eda30 100644 --- 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 42d99f9cb..caeb1483e 100644 --- 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 |