From ae67da4bcb668b61db02aa6807b2d890ad4306f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 11 Jan 2016 11:21:38 -0800 Subject: [PATCH] use absolute path to interface icon --- cmake/templates/Icon.rc.in | 2 +- interface/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/Icon.rc.in b/cmake/templates/Icon.rc.in index c7642347ac..d5f6ca74d6 100644 --- a/cmake/templates/Icon.rc.in +++ b/cmake/templates/Icon.rc.in @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "@CONFIGURE_ICON_FILENAME@" +IDI_ICON1 ICON DISCARDABLE "@CONFIGURE_ICON_PATH@" diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index b34f0d263c..bc459c0e7e 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -100,7 +100,7 @@ if (APPLE) set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME ${INTERFACE_BUNDLE_NAME}) elseif(WIN32) # configure an rc file for the chosen icon - set(CONFIGURE_ICON_FILENAME ${INTERFACE_ICON_FILENAME}) + set(CONFIGURE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME}") set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc") configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})