Skip to content

Commit

Permalink
Mac python build changes:
Browse files Browse the repository at this point in the history
- lib extension is .dylib not .so
- all qt frameworks are needed for linking


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6526 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed Feb 5, 2007
1 parent 5e3037e commit b6c97d1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions python/CMakeLists.txt
Expand Up @@ -7,8 +7,13 @@ IF (WIN32)
ELSE (WIN32)
SET(BINDINGS_CORE_LIB ${CMAKE_CURRENT_BINARY_DIR}/core/core.so)
SET(BINDINGS_GUI_LIB ${CMAKE_CURRENT_BINARY_DIR}/gui/gui.so)
SET(QGIS_CORE_LIB ${CMAKE_BINARY_DIR}/src/core/libqgis_core.so)
SET(QGIS_GUI_LIB ${CMAKE_BINARY_DIR}/src/gui/libqgis_gui.so)
IF (APPLE)
SET(QGIS_CORE_LIB ${CMAKE_BINARY_DIR}/src/core/libqgis_core.dylib)
SET(QGIS_GUI_LIB ${CMAKE_BINARY_DIR}/src/gui/libqgis_gui.dylib)
ELSE (APPLE)
SET(QGIS_CORE_LIB ${CMAKE_BINARY_DIR}/src/core/libqgis_core.so)
SET(QGIS_GUI_LIB ${CMAKE_BINARY_DIR}/src/gui/libqgis_gui.so)
ENDIF (APPLE)
ENDIF (WIN32)

SET (BINDINGS_LIBS ${BINDINGS_CORE_LIB} ${BINDINGS_GUI_LIB})
Expand Down
4 changes: 2 additions & 2 deletions python/configure.py.in
Expand Up @@ -76,15 +76,15 @@ for sip in sips_gui:
# linker flags needed by the Qt library.
makefile_core = sipconfig.ModuleMakefile(
configuration=config,
qt=["QtCore","QtGui","QtXml"],
qt=["QtCore","QtGui","QtNetwork","QtSql","QtSvg","QtXml","Qt3Support"],
build_file=build_file_core,
installs=installs_core,
install_dir=mod_dir,
dir="core")

makefile_gui = sipconfig.ModuleMakefile(
configuration=config,
qt=["QtCore","QtGui","QtXml"],
qt=["QtCore","QtGui","QtNetwork","QtSql","QtSvg","QtXml","Qt3Support"],
build_file=build_file_gui,
installs=installs_gui,
install_dir=mod_dir,
Expand Down

0 comments on commit b6c97d1

Please sign in to comment.