Skip to content
Permalink
Browse files

move qgis.ico back to app

  • Loading branch information
jef-n committed Jul 17, 2011
1 parent 92b5a2c commit d0c0adc54e006a0d8d77aea67feac95789552b16
Showing with 4 additions and 4 deletions.
  1. +0 −4 images/icons/CMakeLists.txt
  2. +4 −0 src/app/CMakeLists.txt
  3. BIN {images/icons → src/app}/qgis.ico
@@ -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)
@@ -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})
File renamed without changes.

2 comments on commit d0c0adc

@kyngchaos

This comment has been minimized.

Copy link
Contributor

@kyngchaos kyngchaos replied Jul 17, 2011

Just wondering - what was wrong with having the icon file in images/icons?

@jef-n

This comment has been minimized.

Copy link
Member Author

@jef-n jef-n replied Jul 18, 2011

qgis_win32.rc won't pick it up there.

Please sign in to comment.
You can’t perform that action at this time.