Skip to content
Permalink
Browse files

Fix Mac compilation. (A complete compilation is now possible but file…

…s are still installed in the wrong place and plugin/providers are not loadable even if moved to the right place.)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6417 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski
telwertowski committed Jan 9, 2007
1 parent 5a1386b commit e8d3464eb84473c9b5add026451408df260835ed
Showing with 8 additions and 4 deletions.
  1. +8 −4 CMakeLists.txt
@@ -98,9 +98,9 @@ IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
MESSAGE(STATUS "Python libraries found")

# TODO: should not be needed, report it to CMake devs
IF (UNIX)
IF (UNIX AND NOT APPLE)
SET (PYTHON_LIBRARIES ${PYTHON_LIBRARIES} util)
ENDIF (UNIX)
ENDIF (UNIX AND NOT APPLE)

# check for SIP
TRY_RUN_PYTHON (HAVE_SIP_MODULE "from sip import wrapinstance")
@@ -129,6 +129,10 @@ SET( QT_USE_QT3SUPPORT TRUE )
SET( QT_USE_QTXML TRUE )
SET( QT_USE_QTNETWORK TRUE )
SET( QT_USE_QTSVG TRUE )
# TODO: should not be needed, report it to CMake devs
IF (APPLE AND QT_USE_QT3SUPPORT)
SET( QT_USE_QTSQL TRUE )
ENDIF (APPLE AND QT_USE_QT3SUPPORT)

FIND_PACKAGE(Qt4 REQUIRED)

@@ -165,11 +169,11 @@ ELSE (WIN32)
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/qgis)
SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)

IF (UNIX)
IF (UNIX AND NOT APPLE)
ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
ENDIF (UNIX)
ENDIF (UNIX AND NOT APPLE)

ENDIF (WIN32)

0 comments on commit e8d3464

Please sign in to comment.
You can’t perform that action at this time.