From 707acd0f9321157dfd25d6e6f1bd9e5d462c89e1 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Tue, 27 Feb 2018 17:18:52 +0100 Subject: [PATCH] Move the MSVC flags into the appropiate file --- CMakeLists.txt | 2 -- cmake/compiler/msvc.cmake | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9133915..277a6e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,8 +126,6 @@ if (CTI_CONTINUABLE_WITH_TESTS OR CTI_CONTINUABLE_WITH_EXAMPLES) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") endif() enable_testing() diff --git a/cmake/compiler/msvc.cmake b/cmake/compiler/msvc.cmake index f109e99..dc0522e 100644 --- a/cmake/compiler/msvc.cmake +++ b/cmake/compiler/msvc.cmake @@ -33,8 +33,9 @@ endif() target_compile_options(continuable-features-flags INTERFACE - /MP2 - /bigobj) + /MP + /bigobj + /permissive-) target_compile_options(continuable-features-warnings INTERFACE