move qgis.ico back to app

2025-02-23 00:02:38 -05:00 · 2011-07-17 22:59:34 +02:00 · 2011-07-17 22:59:34 +02:00 · d0c0adc54e
commit d0c0adc54e
parent 92b5a2c9b1
3 changed files with 4 additions and 4 deletions
--- 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)
--- 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})
--- a/images/icons/qgis.ico
+++ b/images/icons/qgis.ico