Fix Grass Direct module build on Mac

qgis · Dec 10, 2012 · 452f8da · 452f8da
1 parent 75cfd79
commit 452f8da
Showing 1 changed file with 6 additions and 13 deletions.
diff --git 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
 #