Fix OS X icon

This commit is contained in:
Tim Warren 2015-07-14 16:30:12 -04:00
parent 38eef11db2
commit 940513f4c8

View File

@ -73,14 +73,17 @@ file(GLOB widget_SRC
"src/widgets/*.cpp" "src/widgets/*.cpp"
) )
add_library(WidgetLib STATIC ${widget_SRC}) add_library(WidgetLib STATIC ${widget_SRC})
#add_dependencies(WidgetLib BaseLib JsonLib)
target_link_libraries(WidgetLib JsonLib) target_link_libraries(WidgetLib JsonLib)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MACOSX_BUNDLE_ICON_FILE, ${PROJECT_SOURCE_DIR}/resources/platform/osx/tyro.icns) set(MACOSX_icon_file ${CMAKE_CURRENT_SOURCE_DIR}/resources/platform/osx/tyro.icns)
set(MACOSX_BUNDLE_INFO_PLIST, ${PROJECT_SOURCE_DIR}/resources/platform/osx/Info.plist) set(MACOSX_BUNDLE_ICON_FILE tyro.icns)
add_executable(Tyro MACOSX_BUNDLE set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/platform/osx/Info.plist)
src/TyroApp.cpp) 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") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
add_executable(Tyro WIN32 add_executable(Tyro WIN32
resources/platform/msw/resource.rc resources/platform/msw/resource.rc