From 940513f4c8c2065a1a5dc13ec0a5713c7d231de0 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Tue, 14 Jul 2015 16:30:12 -0400 Subject: [PATCH] Fix OS X icon --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5580252..594b55a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,14 +73,17 @@ file(GLOB widget_SRC "src/widgets/*.cpp" ) add_library(WidgetLib STATIC ${widget_SRC}) -#add_dependencies(WidgetLib BaseLib JsonLib) target_link_libraries(WidgetLib JsonLib) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(MACOSX_BUNDLE_ICON_FILE, ${PROJECT_SOURCE_DIR}/resources/platform/osx/tyro.icns) - set(MACOSX_BUNDLE_INFO_PLIST, ${PROJECT_SOURCE_DIR}/resources/platform/osx/Info.plist) - add_executable(Tyro MACOSX_BUNDLE - src/TyroApp.cpp) + set(MACOSX_icon_file ${CMAKE_CURRENT_SOURCE_DIR}/resources/platform/osx/tyro.icns) + set(MACOSX_BUNDLE_ICON_FILE tyro.icns) + set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/platform/osx/Info.plist) + set_source_files_properties(${MACOSX_icon_file} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") + add_executable(Tyro MACOSX_BUNDLE + src/TyroApp.cpp + ${MACOSX_icon_file} + ) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_executable(Tyro WIN32 resources/platform/msw/resource.rc