Skip to content

Commit 452f8da

Browse files
dakcartoblazek
authored andcommittedDec 10, 2012
Fix Grass Direct module build on Mac
1 parent 75cfd79 commit 452f8da

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed
 

‎src/providers/grass/CMakeLists.txt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,26 +197,19 @@ ADD_LIBRARY( ${FAKE_LIB_GRASS_GIS} MODULE qgsgrassgislib.cpp qgsgrassgislibfunct
197197

198198
SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES
199199
CLEAN_DIRECT_OUTPUT 1
200-
FRAMEWORK 1
201-
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
202-
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
203-
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
204-
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrassgislib
205200
COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\" -DGRASS_LIBRARY_GIS=\\\"${GRASS_LIBRARY_gis}\\\" \"-I${CMAKE_CURRENT_SOURCE_DIR}\" ")
206201

207-
SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES
208-
VERSION ${COMPLETE_VERSION}
209-
SOVERSION ${COMPLETE_VERSION}
210-
)
202+
IF (NOT APPLE)
203+
SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES
204+
VERSION ${COMPLETE_VERSION}
205+
SOVERSION ${COMPLETE_VERSION}
206+
)
207+
ENDIF (NOT APPLE)
211208

212209
TARGET_LINK_LIBRARIES(${FAKE_LIB_GRASS_GIS}
213210
qgis_core
214211
)
215212

216-
IF (APPLE)
217-
SET_TARGET_PROPERTIES(${FAKE_LIB_GRASS_GIS} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
218-
ENDIF (APPLE)
219-
220213
#
221214
# GRASS vector provider
222215
#

0 commit comments

Comments
 (0)
Please sign in to comment.