r16346 by malex - Make cmake respect WANT_VERSIONING=0 when setting DOCDIR

scribus-commit scribus-commit at lists.scribus.net
Fri Feb 11 23:59:54 CET 2011


Author: malex
Date: Fri Feb 11 22:59:53 2011
New Revision: 16346

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16346
Log:
Make cmake respect WANT_VERSIONING=0 when setting DOCDIR

Modified:
    branches/Version135/Scribus/CMakeLists.txt

Modified: branches/Version135/Scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16346&path=/branches/Version135/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/CMakeLists.txt Fri Feb 11 22:59:53 2011
@@ -265,7 +265,11 @@
   IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+        IF(NOT WANT_VERSIONING)
+            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
+        ELSE(NOT WANT_VERSIONING)
+            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+        ENDIF(NOT WANT_VERSIONING)
   ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
 ENDIF (WIN32 OR OS2)
 ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")




More information about the scribus-commit mailing list