Răsfoiți Sursa

* BugFix: Correct icon file handling on OSX.

Robert MacGregor 3 ani în urmă
părinte
comite
342449625b
1 a modificat fișierele cu 8 adăugiri și 6 ștergeri
  1. 8 6
      Engine/source/CMakeLists.txt

+ 8 - 6
Engine/source/CMakeLists.txt

@@ -249,12 +249,6 @@ foreach (TORQUE_MODULE_PATH ${TORQUE_MODULE_PATHS})
 endforeach()
 endforeach()
 
 
 if (APPLE)
 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
   # Next setup the icon for OSX
   set_source_files_properties("${CMAKE_SOURCE_DIR}/Tools/CMake/torque.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
   set_source_files_properties("${CMAKE_SOURCE_DIR}/Tools/CMake/torque.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif (APPLE)
 endif (APPLE)
@@ -268,6 +262,14 @@ else()
   add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES})
   add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES})
 endif()
 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_compile_definitions(${TORQUE_APP_NAME} PUBLIC ${TORQUE_COMPILE_DEFINITIONS})
 target_link_libraries(${TORQUE_APP_NAME} ${TORQUE_LINK_LIBRARIES})
 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})
 target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})