Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move qgis.ico back to app
  • Loading branch information
jef-n committed Jul 17, 2011
1 parent 92b5a2c commit d0c0adc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 0 additions & 4 deletions images/icons/CMakeLists.txt
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/app/CMakeLists.txt
Expand Up @@ -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})
Expand Down
File renamed without changes.

2 comments on commit d0c0adc

@kyngchaos
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jef-n
Copy link
Member Author

@jef-n jef-n commented on d0c0adc Jul 18, 2011

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qgis_win32.rc won't pick it up there.

Please sign in to comment.