[QGIS Commit] r12779 - trunk/qgis/cmake
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Jan 16 12:07:19 EST 2010
Author: kyngchaos
Date: 2010-01-16 12:07:18 -0500 (Sat, 16 Jan 2010)
New Revision: 12779
Modified:
trunk/qgis/cmake/SIPMacros.cmake
Log:
link python modules as modules on OSX
Modified: trunk/qgis/cmake/SIPMacros.cmake
===================================================================
--- trunk/qgis/cmake/SIPMacros.cmake 2010-01-16 14:17:45 UTC (rev 12778)
+++ trunk/qgis/cmake/SIPMacros.cmake 2010-01-16 17:07:18 UTC (rev 12779)
@@ -103,13 +103,18 @@
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
)
# not sure if type MODULE could be uses anywhere, limit to cygwin for now
- IF (CYGWIN)
+ IF (CYGWIN OR APPLE)
ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} )
- ELSE (CYGWIN)
+ ELSE (CYGWIN OR APPLE)
ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
ENDIF (CYGWIN)
- TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
+ IF (NOT APPLE)
+ TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
+ ENDIF (NOT APPLE)
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
+ IF (APPLE)
+ SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ ENDIF (APPLE)
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
IF (WIN32)
More information about the QGIS-commit
mailing list