Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Drop the debug "d" on Windows too

Released archives and the Progmasoft Linux packages hold release builds,
so a debug build needs no file name of its own on any platform. Catch3 and
Catch3Main now have the same names in every configuration everywhere.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Commit
95e2cad52aa1dd573ea0e6075af0fdd49c30a78a
Author
Leitwolf11 ·
Parents
5da6bc7b6ab2

Files · Download .tar.gz

Changes

 docs/progmasoft-catch3.md |  4 ++--
 src/CMakeLists.txt        | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/docs/progmasoft-catch3.md b/docs/progmasoft-catch3.md
index dbc1bded..a28bc7e1 100644
--- a/docs/progmasoft-catch3.md
+++ b/docs/progmasoft-catch3.md
@@ -181,8 +181,8 @@ target_link_libraries(MyTests PRIVATE Catch3::Catch3WithMain)
 
 Without a build system, an installed Catch3 links by its name: the library is
 `Catch3` and the one that brings `main` is `Catch3Main`, as `libCatch3.a` and
-`libCatch3Main.a` (`Catch3.lib` and `Catch3Main.lib` on Windows, where a debug
-build adds a `d`). `Catch3Main` comes first, since it uses `Catch3`:
+`libCatch3Main.a` (`Catch3.lib` and `Catch3Main.lib` on Windows), in every
+build configuration. `Catch3Main` comes first, since it uses `Catch3`:
 
 ```sh
 c++ -std=c++17 tests.cpp -lCatch3Main -lCatch3
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 14cbce8f..5e4cb935 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -399,7 +399,9 @@ target_link_libraries(Catch3
 )
 
 # The files are libCatch3 and libCatch3Main (Catch3.lib and Catch3Main.lib on
-# Windows), so that an installed Catch3 links with -lCatch3 and -lCatch3Main.
+# Windows) in every configuration, so that an installed Catch3 links with
+# -lCatch3 and -lCatch3Main. Released archives and packages hold release
+# builds, so a debug build needs no name of its own.
 set_target_properties(Catch3 PROPERTIES
   VERSION ${PROJECT_VERSION}
   SOVERSION ${PROJECT_VERSION}
@@ -435,13 +437,6 @@ set_target_properties(Catch3WithMain
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION}
 )
-# A debug build of Windows links the debug C runtime, so its files carry a "d"
-# and a debug and a release build can be installed side by side. Elsewhere
-# the files have the same name in every configuration.
-if(WIN32)
-  set_target_properties(Catch3 Catch3WithMain PROPERTIES DEBUG_POSTFIX "d")
-endif()
-
 if(NOT_SUBPROJECT)
   # Create and install an export set for the targets as Catch3::Catch3 and
   # Catch3::Catch3WithMain.