diff --git a/images/icons/CMakeLists.txt b/images/icons/CMakeLists.txt index 20985cead46..b0830a28a7a 100644 --- a/images/icons/CMakeLists.txt +++ b/images/icons/CMakeLists.txt @@ -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) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 91bc581cb04..8fb4711604d 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -421,6 +421,10 @@ IF (SPATIALITE_FOUND) TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${SPATIALITE_LIBRARY}) ENDIF (SPATIALITE_FOUND) +IF(MSVC) + INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons) +ENDIF(MSVC) + INSTALL(TARGETS ${QGIS_APP_NAME} BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX} RUNTIME DESTINATION ${QGIS_BIN_DIR}) diff --git a/images/icons/qgis.ico b/src/app/qgis.ico similarity index 100% rename from images/icons/qgis.ico rename to src/app/qgis.ico