diff --git a/cspell.config.yaml b/cspell.config.yaml index 06a6e0b..574fd57 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -79,3 +79,4 @@ words: - VSINSTALLDIR - vswhere - webp + - WMAIN diff --git a/my_exe/test/CMakeLists.txt b/my_exe/test/CMakeLists.txt index 8d0d60f..204429b 100644 --- a/my_exe/test/CMakeLists.txt +++ b/my_exe/test/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries( ${my_exe_LINKED_LIBRARIES}) # generate a main function for the test executable -target_compile_definitions(my_exe_helpers_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_exe_helpers_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) # use xml reporter if coverage is enabled if(${ENABLE_COVERAGE}) diff --git a/my_header_lib/test/CMakeLists.txt b/my_header_lib/test/CMakeLists.txt index e953253..ac54b3f 100644 --- a/my_header_lib/test/CMakeLists.txt +++ b/my_header_lib/test/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries( project_options Catch2::Catch2) # generate a main function for the test executable -target_compile_definitions(my_header_lib_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_header_lib_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) # use xml reporter if coverage is enabled if(${ENABLE_COVERAGE}) diff --git a/my_header_lib/test/constexpr/CMakeLists.txt b/my_header_lib/test/constexpr/CMakeLists.txt index 9a5b567..10209f3 100644 --- a/my_header_lib/test/constexpr/CMakeLists.txt +++ b/my_header_lib/test/constexpr/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries( project_warnings project_options Catch2::Catch2) -target_compile_definitions(my_header_lib_constexpr_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_header_lib_constexpr_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) catch_discover_tests(my_header_lib_constexpr_tests ${COVERAGE_ARGS}) @@ -21,7 +21,7 @@ target_link_libraries( project_warnings project_options Catch2::Catch2) -target_compile_definitions(my_header_lib_relaxed_constexpr_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_header_lib_relaxed_constexpr_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) target_compile_definitions(my_header_lib_relaxed_constexpr_tests PRIVATE -DCATCH_CONFIG_RUNTIME_STATIC_REQUIRE) catch_discover_tests(my_header_lib_relaxed_constexpr_tests ${COVERAGE_ARGS}) diff --git a/my_lib/test/CMakeLists.txt b/my_lib/test/CMakeLists.txt index 17aa3f6..80d7825 100644 --- a/my_lib/test/CMakeLists.txt +++ b/my_lib/test/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries( project_options Catch2::Catch2) # generate a main function for the test executable -target_compile_definitions(my_lib_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_lib_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) # use xml reporter if coverage is enabled if(${ENABLE_COVERAGE}) diff --git a/my_lib/test/constexpr/CMakeLists.txt b/my_lib/test/constexpr/CMakeLists.txt index b4046f3..ac2c61f 100644 --- a/my_lib/test/constexpr/CMakeLists.txt +++ b/my_lib/test/constexpr/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries( project_warnings project_options Catch2::Catch2) -target_compile_definitions(my_lib_constexpr_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_lib_constexpr_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) catch_discover_tests(my_lib_constexpr_tests ${COVERAGE_ARGS}) @@ -21,7 +21,7 @@ target_link_libraries( project_warnings project_options Catch2::Catch2) -target_compile_definitions(my_lib_relaxed_constexpr_tests PRIVATE CATCH_CONFIG_MAIN) +target_compile_definitions(my_lib_relaxed_constexpr_tests PRIVATE CATCH_CONFIG_MAIN DO_NOT_USE_WMAIN) target_compile_definitions(my_lib_relaxed_constexpr_tests PRIVATE -DCATCH_CONFIG_RUNTIME_STATIC_REQUIRE) catch_discover_tests(my_lib_relaxed_constexpr_tests ${COVERAGE_ARGS})