r16345 by malex - Fix the bug with SHAREDIR not respecting WANT_VERSIONING in cmake

scribus-commit scribus-commit at lists.scribus.net
Fri Feb 11 22:22:03 CET 2011


Author: malex
Date: Fri Feb 11 21:22:02 2011
New Revision: 16345

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16345
Log:
Fix the bug with SHAREDIR not respecting WANT_VERSIONING in cmake

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16345&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Fri Feb 11 21:22:02 2011
@@ -237,8 +237,12 @@
 #MAN
 CMAKE_POLICY(SET CMP0005 OLD)
 SET(MANDIR "share/man/")
-SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
-ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
+ADD_IF(WANT_VERSIONING)
+    SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ELSE(WANT_VERSIONING)
+    SET(SHAREDIR "share/${MAIN_DIR_NAME}/")
+ENDIF(WANT_VERSIONING)
+DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
 
 #SHARE - use the default on Apple as TAG_VERSION is empty
 IF(WIN32 OR OS2)




More information about the scribus-commit mailing list