Cmake: Random fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df1c0e69da73c513c2d480dd751d4af96fc18e5..7714f49483e3614f63e476cde2b9c69a0c46df57 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,7 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
 INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigInkscapeDepends)\r
-
-SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")\r
+\r
 INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )\r
 LINK_DIRECTORIES (src/)\r
 \r

diff --git a/config.h.cmake b/config.h.cmake
index fe4666ec2f9d9682e26463d70ffe58a4db810284..1812864d37d545b263e105884461133f1f17f18d 100644 (file)
--- 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 000f26b3d5471a2755fd58730d6379ed9382e86d..42d99f9cb86742f6ba3799d6c32a15a845db058f 100644 (file)
--- 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