diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c01cf45c..e2760f5f 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -6,8 +6,6 @@ if(POLICY CMP0167) cmake_policy(SET CMP0167 NEW) endif() project(libloot VERSION "0.27.0") -include(ExternalProject) -include(FetchContent) include(CMakeDependentOption) include(CMakePackageConfigHelpers) include(GNUInstallDirs) @@ -25,10 +23,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(MSVC) - add_compile_options("/MP") -endif() - ############################## # External Projects ############################## @@ -191,7 +185,7 @@ endif() if(MSVC) # Turn off permissive mode to be more standards-compliant and avoid compiler errors. - target_compile_options(loot PRIVATE "/permissive-" "/W4" "/Zc:__cplusplus" "/GL") + target_compile_options(loot PRIVATE "/permissive-" "/W4" "/Zc:__cplusplus" "/GL" "/MP") target_link_options(loot PRIVATE "/LTCG") endif() diff --git a/cpp/cmake/tests.cmake b/cpp/cmake/tests.cmake index 9f05e593..99a23c6d 100644 --- a/cpp/cmake/tests.cmake +++ b/cpp/cmake/tests.cmake @@ -102,7 +102,7 @@ endif() if(MSVC) # Turn off permissive mode to be more standards-compliant and avoid compiler errors. - target_compile_options(libloot_tests PRIVATE "/Zc:__cplusplus" "/permissive-" "/W4") + target_compile_options(libloot_tests PRIVATE "/Zc:__cplusplus" "/permissive-" "/W4" "/MP") endif()