move qgis.ico back to app

Author: jef-n

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)

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})