r15436 by craig - Remove CMake 2.8.x dependency by simplifying condition in if

scribus-commit scribus-commit at lists.scribus.net
Mon Aug 23 18:21:13 CEST 2010


Author: craig
Date: Mon Aug 23 16:21:12 2010
New Revision: 15436

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15436
Log:
Remove CMake 2.8.x dependency by simplifying condition in if

Modified:
    branches/Version135/Scribus/scribus/CMakeLists.txt

Modified: branches/Version135/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15436&path=/branches/Version135/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/scribus/CMakeLists.txt Mon Aug 23 16:21:12 2010
@@ -719,15 +719,21 @@
 ENDIF(WIN32)
 
 ##TEST FIX FOR 6897
-IF ((GCC AND NOT WIN32) OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 # Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
 # binary are in the public symbol table for plugins. The symbols must also
 # be set as SCRIBUS_API if we're building with -fvisibility=hidden .
 # Should fix bug 6897 .
-     SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-ENDIF ((GCC AND NOT WIN32) OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
+ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+IF (GCC AND NOT WIN32)
+# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
+# binary are in the public symbol table for plugins. The symbols must also
+# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
+# Should fix bug 6897 .
+  SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
+ENDIF (GCC AND NOT WIN32)
 ##
-
 
 #Set up libraries to link with all found packages
 




More information about the scribus-commit mailing list