Skip to content

Update Catch2 library settings for MSVC and C++ standard #3066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AbhishekkSaini wants to merge 1 commit into
base: devel
Choose a base branch
from
+15 −1
Open

Update Catch2 library settings for MSVC and C++ standard #3066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,21 @@ add_library(Catch2 ${ALL_FILES})
if(CATCH_ENABLE_REPRODUCIBLE_BUILD)
add_build_reproducibility_settings(Catch2)
endif()

if(MSVC)
target_compile_options(Catch2 PUBLIC /MP)
endif()

target_compile_features(Catch2 PRIVATE cxx_std_17)

# Batch size 8 avoids operator<< conflicts while maintaining speed
set_target_properties(Catch2
PROPERTIES
UNITY_BUILD ON
UNITY_BUILD_BATCH_SIZE 8
)


add_library(Catch2::Catch2 ALIAS Catch2)

if(ANDROID)
Expand All @@ -368,7 +383,6 @@ set_target_properties(Catch2 PROPERTIES
)

# require C++14
target_compile_features(Catch2 PUBLIC cxx_std_14)

configure_file(
"${SOURCES_DIR}/catch_user_config.hpp.in"
Expand Down