TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #694 from rextimmy/cmake_cpp17

Browse source 
Minor cmake corrections
This commit is contained in:
Brian Roberts 2021-12-02 15:19:10 -06:00 committed by GitHub
parent 7f93734cb7 a0a3608c34
commit 82b33b757a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats 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")
endif()
endif()
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
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
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})
endif()