fix: do not use wmain with catch2 by defining DO_NOT_USE_WMAIN

aminya · aminya · commit f07975a567d7 · 2022-06-02T14:20:26.000-07:00
catchorg/Catch2#2441
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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})

-Original file line number
+Diff line change
   - VSINSTALLDIR
   - vswhere
   - webp
 +  - WMAIN