summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-04-04 09:40:51 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-04-04 09:40:51 +0000
commitc7cf42760a64e3966a012c06c1bdea4698997122 (patch)
tree8ab8e7bd4fabaf1a66cecc80100a4af470719991
parentcmake: move extension param files to their own CMakeLists.txt (diff)
downloadinkscape-c7cf42760a64e3966a012c06c1bdea4698997122.tar.gz
inkscape-c7cf42760a64e3966a012c06c1bdea4698997122.zip
cmake: fix PACKAGE_LOCALE_DIR for win32. todo: check for linux
(bzr r5327)
-rw-r--r--CMakeLists.txt9
-rw-r--r--config.h.cmake2
2 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd0fff9d6..58ab4de05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,15 @@ SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
# Set to true if compiler/linker should enable profiling:
#SET(ENABLE_PROFILING TRUE)
+# Probably best to move all these path things to a single file
+IF(WIN32)
+ SET(PACKAGE_LOCALE_DIR "locale")
+ELSEIF(WIN32)
+ # TODO: check and change this to correct value:
+ SET(PACKAGE_LOCALE_DIR "locale")
+ENDIF(WIN32)
+
+
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
SET(CMAKE_SKIP_RPATH:BOOL OFF)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
diff --git a/config.h.cmake b/config.h.cmake
index 1812864d3..beacf65ed 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -219,7 +219,7 @@
#cmakedefine PACKAGE_BUGREPORT ""
/* Localization directory */
-#cmakedefine PACKAGE_LOCALE_DIR
+#define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}"
/* Define to the full name of this package. */
#define PACKAGE_NAME "${PROJECT_NAME}"