TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Torque now requires c++17 due to new torque script code

Browse source 
* Minimum version of cmake is now beyond 3.6.0, no need to check for that when selecting VS_STARTUP_PROJECT
This commit is contained in:
rextimmy 2021-12-02 20:40:15 +10:00
parent 346a84d16c
commit a0a3608c34
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Tools/CMake/torque3d.cmake
View file

@ -48,8 +48,6 @@ if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
endif() endif()
endif() endif()
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif() endif()
############################################################################### ###############################################################################
@ -658,8 +656,11 @@ finishExecutable()
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# Torque requires c++17
target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_17)
# Set Visual Studio startup project # Set Visual Studio startup project
if((${CMAKE_VERSION} VERSION_EQUAL 3.6.0) OR (${CMAKE_VERSION} VERSION_GREATER 3.6.0) AND MSVC) if(MSVC)
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME}) set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME})
endif() endif()