From 1ac2fcae9d159595fd017e3256a210b92c706e25 Mon Sep 17 00:00:00 2001 From: Larry Shaffer Date: Mon, 10 Dec 2012 12:28:06 -0700 Subject: [PATCH] Fix Grass Direct module build on Mac --- src/providers/grass/CMakeLists.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt index 7efe77c38310..e9a3493ad389 100644 --- a/src/providers/grass/CMakeLists.txt +++ b/src/providers/grass/CMakeLists.txt @@ -197,26 +197,19 @@ ADD_LIBRARY( ${FAKE_LIB_GRASS_GIS} MODULE qgsgrassgislib.cpp qgsgrassgislibfunct SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES CLEAN_DIRECT_OUTPUT 1 - FRAMEWORK 1 - FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}" - MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in" - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrassgislib COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\" -DGRASS_LIBRARY_GIS=\\\"${GRASS_LIBRARY_gis}\\\" \"-I${CMAKE_CURRENT_SOURCE_DIR}\" ") -SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES - VERSION ${COMPLETE_VERSION} - SOVERSION ${COMPLETE_VERSION} - ) +IF (NOT APPLE) + SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES + VERSION ${COMPLETE_VERSION} + SOVERSION ${COMPLETE_VERSION} + ) +ENDIF (NOT APPLE) TARGET_LINK_LIBRARIES(${FAKE_LIB_GRASS_GIS} qgis_core ) -IF (APPLE) - SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -ENDIF (APPLE) - # # GRASS vector provider #