libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude CMake CXX standard from MSVC

This commit is contained in:
Jack Andersen 2020-04-10 18:54:35 -10:00
parent 9c39a038a5
commit ebda6add23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17 cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
project(athena) project(athena)
set(CMAKE_CXX_STANDARD 17) if (NOT MSVC)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
################## ##################
# Athena Version # # Athena Version #

2
atdna/FindLLVM.cmake
View File

@ -30,7 +30,7 @@
set(LLVM_ROOT_DIR "" CACHE PATH "Location of LLVM development root") set(LLVM_ROOT_DIR "" CACHE PATH "Location of LLVM development root")
set(LLVM_FIND_COMPONENTS "") set(LLVM_FIND_COMPONENTS "")
if(WIN32) if(WIN32)
get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE) get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE CACHE)
endif() endif()
set(llvm_config_names llvm-config-3.9 llvm-config39 set(llvm_config_names llvm-config-3.9 llvm-config39