r16928 by craig - #10328: Only set QT_MAC_USE_COCOA and HAVE_CARBON IF(APPLE)

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 23 20:12:35 UTC 2011


Author: craig
Date: Sun Oct 23 20:12:35 2011
New Revision: 16928

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16928
Log:
#10328: Only set QT_MAC_USE_COCOA and HAVE_CARBON IF(APPLE)

Modified:
    branches/Version135/Scribus/CMakeLists.txt

Modified: branches/Version135/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16928&path=/branches/Version135/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/CMakeLists.txt Sun Oct 23 20:12:35 2011
@@ -465,21 +465,21 @@
 #<< Qt
 SET (QT_MT_REQUIRED TRUE)
 SET (QT_MIN_VERSION "4.6.0")
-IF (WANT_QT4MAC_COCOA)
-  SET (QT_MAC_USE_COCOA TRUE)
-ELSE (WANT_QT4MAC_COCOA)
-  SET (HAVE_CARBON 1 CACHE TYPE BOOL)
-  ADD_DEFINITIONS("-DHAVE_CARBON=1")
-ENDIF (WANT_QT4MAC_COCOA)
+IF(APPLE)
+  IF (WANT_QT4MAC_COCOA)
+	SET (QT_MAC_USE_COCOA TRUE)
+  ELSE (WANT_QT4MAC_COCOA)
+	SET (HAVE_CARBON 1 CACHE TYPE BOOL)
+	ADD_DEFINITIONS("-DHAVE_CARBON=1")
+  ENDIF (WANT_QT4MAC_COCOA)
+  SET( QT_USE_QTSQL TRUE )
+ENDIF(APPLE)
 IF (WANT_QT3SUPPORT)
   SET (QT_USE_QT3SUPPORT TRUE)
 ELSE (WANT_QT3SUPPORT)
   SET (QT_USE_QT3SUPPORT FALSE)
 ENDIF (WANT_QT3SUPPORT)
 SET (QT_USE_QTXML TRUE )
-IF (APPLE)
-  SET( QT_USE_QTSQL TRUE )
-ENDIF (APPLE)
 SET( QT_USE_QTNETWORK TRUE )
 FIND_PACKAGE(Qt4 REQUIRED)
 INCLUDE( ${QT_USE_FILE} )




More information about the scribus-commit mailing list