From d1dbfad0c72b4e332ab5698a8a896024e90355ed Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 14 Dec 2021 19:11:18 -0500 Subject: [PATCH 1/2] * [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided. --- Tools/CMake/basics.cmake | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index dbd6f9a71..89d2c43dd 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -386,7 +386,7 @@ macro(finishExecutable) else() add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files}) endif() - + # Torque requires c++17 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) @@ -478,18 +478,13 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}") endif() -if(UNIX AND NOT APPLE) +if(UNIX) SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${projectOutDir}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}") SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") -endif() - -if(APPLE) - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") endif() # fix the debug/release subfolders on windows From bd979aa5cfeb2b7a94b7e73a276f4e1aa610a13b Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 14 Dec 2021 22:23:23 -0500 Subject: [PATCH 2/2] * Adjustment: Minor formatting fix in basics.cmake. --- Tools/CMake/basics.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index 89d2c43dd..c0fc10426 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -386,7 +386,7 @@ macro(finishExecutable) else() add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files}) endif() - + # Torque requires c++17 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) @@ -483,8 +483,8 @@ if(UNIX) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}") SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}") endif() # fix the debug/release subfolders on windows