mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-15 00:04:00 -04:00
fix windows build
This commit is contained in:
parent
97f8039e9d
commit
6d90708e86
@ -3,10 +3,6 @@ FILE (GLOB IMAGES *.png)
|
||||
INSTALL (FILES ${IMAGES}
|
||||
DESTINATION ${QGIS_DATA_DIR}/images/icons)
|
||||
|
||||
IF(MSVC)
|
||||
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
|
||||
ENDIF(MSVC)
|
||||
|
||||
# OS X app/doc icons
|
||||
IF (APPLE)
|
||||
ADD_SUBDIRECTORY(mac)
|
||||
|
@ -31,7 +31,7 @@ IF (NOT APPLE)
|
||||
TARGET_LINK_LIBRARIES(pyspatialite ${PYTHON_LIBRARY})
|
||||
ENDIF (NOT APPLE)
|
||||
|
||||
TARGET_LINK_LIBRARIES(pyspatialite ${EXTRA_LINK_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES(pyspatialite qgis_core)
|
||||
|
||||
IF (APPLE)
|
||||
SET_TARGET_PROPERTIES(pyspatialite PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
|
||||
|
@ -423,6 +423,10 @@ INSTALL(TARGETS ${QGIS_APP_NAME}
|
||||
BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
|
||||
RUNTIME DESTINATION ${QGIS_BIN_DIR})
|
||||
|
||||
IF (MSVC)
|
||||
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
|
||||
ENDIF (MSVC)
|
||||
|
||||
IF (APPLE)
|
||||
INSTALL(CODE "EXECUTE_PROCESS(COMMAND /bin/echo -n \"APPLQGIS\" OUTPUT_FILE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../PkgInfo\")")
|
||||
ENDIF (APPLE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user