diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index 83e9e1952..dbd6f9a71 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -348,6 +348,8 @@ macro(finishLibrary) add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files}) endif() + target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) + # omg - only use the first folder ... otherwise we get lots of header name collisions #foreach(dir ${${PROJECT_NAME}_paths}) addInclude("${firstDir}") @@ -384,6 +386,10 @@ 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) + addInclude("${firstDir}") _postTargetProcess() diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 46b41ef19..2f5a0b6ac 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -656,9 +656,6 @@ finishExecutable() ############################################################################### ############################################################################### -# Torque requires c++17 -target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_17) - # Set Visual Studio startup project if(MSVC) set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME})