From 342449625beaabd1cdff994446e2f485d45cb21d Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 31 May 2022 07:30:32 -0400 Subject: [PATCH] * BugFix: Correct icon file handling on OSX. --- Engine/source/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 13199484d..09ddca020 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -249,12 +249,6 @@ foreach (TORQUE_MODULE_PATH ${TORQUE_MODULE_PATHS}) endforeach() if (APPLE) - # Parameters used for the plist configuration - set(EXECUTABLE_NAME "${TORQUE_APP_NAME}") - - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Tools/CMake/Info.plist.in" "${CMAKE_BINARY_DIR}/temp/Info.plist" COPYONLY) - set_target_properties(${TORQUE_APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/temp/Info.plist") - # Next setup the icon for OSX set_source_files_properties("${CMAKE_SOURCE_DIR}/Tools/CMake/torque.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") endif (APPLE) @@ -268,6 +262,14 @@ else() add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES}) endif() +if (APPLE) + # Parameters used for the plist configuration + set(EXECUTABLE_NAME "${TORQUE_APP_NAME}") + + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Tools/CMake/Info.plist.in" "${CMAKE_BINARY_DIR}/temp/Info.plist" COPYONLY) + set_target_properties(${TORQUE_APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/temp/Info.plist") +endif (APPLE) + target_compile_definitions(${TORQUE_APP_NAME} PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_link_libraries(${TORQUE_APP_NAME} ${TORQUE_LINK_LIBRARIES}) target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})