TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided.

Browse source
This commit is contained in:
Robert MacGregor 2021-12-14 19:11:18 -05:00
parent 3c95fa808e
commit d1dbfad0c7
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Tools/CMake/basics.cmake
View file

@ -386,7 +386,7 @@ macro(finishExecutable)
else() else()
add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files}) add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
endif() endif()
# Torque requires c++17 # Torque requires c++17
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_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}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${projectOutDir}") SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${projectOutDir}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}")
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
endif() SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
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}")
endif() endif()
# fix the debug/release subfolders on windows # fix the debug/release subfolders on windows