[QGIS Commit] r15096 - trunk/qgis

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Jan 28 11:59:02 EST 2011


Author: jef
Date: 2011-01-28 08:59:02 -0800 (Fri, 28 Jan 2011)
New Revision: 15096

Modified:
   trunk/qgis/CMakeLists.txt
Log:
build with -fno-strict-aliasing on powerpc (see bugs.debian.org/603986)

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2011-01-28 16:20:37 UTC (rev 15095)
+++ trunk/qgis/CMakeLists.txt	2011-01-28 16:59:02 UTC (rev 15096)
@@ -226,6 +226,11 @@
   ENDIF (MSVC)
 ENDIF (PEDANTIC)
 
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+  # spatialite crashes on ppc - see bugs.debian.org/603986
+  ADD_DEFINITIONS( -fno-strict-aliasing )
+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+
 IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   MESSAGE (STATUS "Debug output enabled")
   ADD_DEFINITIONS(-DQGISDEBUG=1)
@@ -403,13 +408,13 @@
   INCLUDE(PyQt4Macros)
 
   # setup SIP variables
-  separate_arguments(PYQT4_SIP_FLAGS) # convert space separated values to a list
-  set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  set(SIP_CONCAT_PARTS 4)
-  set(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS})
+  SEPARATE_ARGUMENTS(PYQT4_SIP_FLAGS) # convert space separated values to a list
+  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
+  SET(SIP_CONCAT_PARTS 4)
+  SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS})
 
   IF (NOT BINDINGS_GLOBAL_INSTALL)
-    set(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)
+    SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)
   ENDIF (NOT BINDINGS_GLOBAL_INSTALL)
 
 ENDIF (WITH_BINDINGS)



More information about the QGIS-commit mailing list