diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-04-01 00:17:04 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-04-01 00:17:04 +0000 |
| commit | fc9c8be6a8cb41665b2884f58e481732e75bc621 (patch) | |
| tree | f1f286cbe8d771bcc58943200007619d186693e4 | |
| parent | Cmake: Generate inkscape_version.h (diff) | |
| download | inkscape-fc9c8be6a8cb41665b2884f58e481732e75bc621.tar.gz inkscape-fc9c8be6a8cb41665b2884f58e481732e75bc621.zip | |
Cmake: Random fixes
(bzr r5287)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0df1c0e69..7714f4948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,7 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
INCLUDE(ConfigCompileFlags)
INCLUDE(ConfigInkscapeDepends)
- -SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )
LINK_DIRECTORIES (src/)
diff --git a/config.h.cmake b/config.h.cmake index fe4666ec2..1812864d3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -200,7 +200,7 @@ #cmakedefine HAVE_ZLIB_H 1 /* Base data directory -- only path-prefix.h should use it! */ -#cmakedefine INKSCAPE_DATADIR +#define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share" /* Base library directory -- only path-prefix.h should use it! */ #cmakedefine INKSCAPE_LIBDIR diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 000f26b3d..42d99f9cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ SET(INKSCAPE_SRC -${CONFIG_H} arc-context.cpp attributes.cpp axis-manip.cpp |