r14949 by jghali - #8980: CMake Installation problem for Win32 & OS2

scribus-commit scribus-commit at lists.scribus.net
Mon Mar 29 23:30:32 CEST 2010


Revision: 14949
Author: jghali
Date: 2010-03-29T21:25:54.540966Z
Commit message: #8980: CMake Installation problem for Win32 & OS2

Changeset: 
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14948)
+++ CMakeLists.txt	(revision 14949)
@@ -241,11 +241,15 @@
 ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
 
 #SHARE - use the default on Apple as TAG_VERSION is empty
-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}/")
-ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+IF(WIN32 OR OS2)
+  SET(DOCDIR "share/doc/")
+ELSE (WIN32 OR OS2)
+  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}/")
+  ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+ENDIF (WIN32 OR OS2)
 ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
 
 #ICON




More information about the scribus-commit mailing list