diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc.cmake | 8 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index b347ecc3..0469617d 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -18,9 +18,9 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/opentrack-policy.cmake") include("${CMAKE_CURRENT_LIST_DIR}/opentrack-policy.cmake" NO_POLICY_SCOPE) endif() -set(CMAKE_C_COMPILER_INIT cl.exe) -set(CMAKE_CXX_COMPILER_INIT cl.exe) -set(CMAKE_ASM_NASM_COMPILER_INIT nasm.exe) +#set(CMAKE_GENERATOR Ninja) +#set(CMAKE_MAKE_PROGRAM ninja.exe) +set(CMAKE_ASM_NASM_COMPILER nasm.exe) # search for programs in the host directories SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) @@ -28,8 +28,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_MAKE_PROGRAM ninja) -set(CMAKE_GENERATOR "Ninja") #add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) #add_compile_options(-Qvec-report:2) diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 7aceb17a..bd9fd62b 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -123,6 +123,7 @@ if(MSVC) add_definitions(-D_ENABLE_ATOMIC_ALIGNMENT_FIX) add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING) add_definitions(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING) + add_definitions(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) add_compile_options(-permissive-) |