Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 16:34:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix reference to rc template and icon prefix

Browse source
This commit is contained in:
Stephen Birarda 2016-01-11 11:08:24 -08:00
parent f8f0b99a46
commit 301124ba3c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/macros/SetPackagingParameters.cmake
View file

@ -45,7 +45,7 @@ macro(SET_PACKAGING_PARAMETERS)
if (WIN32)
set(INTERFACE_EXEC_NAME "interface")
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_NAME}.ico")
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
endif ()
if (APPLE)
@ -56,7 +56,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(INTERFACE_INSTALL_DIR ".")
set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_BUNDLE_NAME}.app")
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_NAME}.icns")
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
else ()
set(CONSOLE_INSTALL_DIR ".")
set(INTERFACE_INSTALL_DIR ".")

2
cmake/templates/Icon.rc.in
View file

@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "@ICON_FILENAME@"
IDI_ICON1 ICON DISCARDABLE "@CONFIGURE_ICON_FILENAME@"

2
interface/CMakeLists.txt
View file

@ -102,7 +102,7 @@ elseif(WIN32)
# configure an rc file for the chosen icon
set(CONFIGURE_ICON_FILENAME ${INTERFACE_ICON_FILENAME})
set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
# add an executable that also has the icon itself and the configured rc file as resources
add_executable(${TARGET_NAME} WIN32