diff options
| author | Leitwolf11 | 2026-10-25 02:37:35 +0300 |
|---|---|---|
| committer | Leitwolf11 | 2026-10-25 02:37:35 +0300 |
| commit | 126dc333564cb72b5115d9a9242d66694694b6d0 (patch) | |
| tree | 0bce4462b2e190c39b3e1c5f697e3e4abd1a5e2a /premake5.lua | |
| parent | 13f81a480a93807c14dddb5abdb97355ced4d4c5 (diff) | |
| download | catch3-126dc333564cb72b5115d9a9242d66694694b6d0.tar.gz | |
Give Catch3 its own build names and headers
Catch2 compatibility means the API tests are written in: the macros, such
as TEST_CASE and REQUIRE, and the Catch:: namespace. It does not mean
Catch2's build names or header paths. find_package(Catch2) found Catch3,
and a project using both frameworks met two packages, two sets of targets,
two Catch.cmake modules and two catch2/ header trees with the same names.
Build names:
- CMake: project and package Catch3, targets Catch3::Catch3 and
Catch3::Catch3WithMain, libraries Catch3 and Catch3Main, options
CATCH3_*, lib/cmake/Catch3 with Catch3Config, and pkg-config catch3 and
catch3-with-main. The version is Catch3's, 0.3.0, compatible within a
minor version.
- The CMake scripts are Catch3.cmake (catch3_discover_tests),
Catch3AddTests.cmake and Catch3ShardTests.cmake
(catch3_add_sharded_tests); the helpers they define at ctest time have a
catch3_ prefix. ParseAndAddCatchTests.cmake, deprecated upstream, is gone.
- Bazel //:catch3 and //:catch3_main, Meson catch3 and catch3-with-main
(with override_dependency), Xmake catch3 and catch3_main, Premake Catch3
and Catch3WithMain. Visual Studio projects get GUIDs of their own.
- The Progmasoft::Catch3 target and package are gone: property testing
and snapshots are part of Catch3::Catch3. Their sources now build with
the library's warning flags, so property failures are built field by
field (no missing initializers) and the default property name is a
thread-local pointer to the name its scope owns (no global destructor).
Headers: the engine moved from src/catch2 to src/Progmasoft/Catch3 with
Progmasoft names, so <catch2/catch_test_macros.hpp> is
<Progmasoft/Catch3/TestMacros.hpp>, <catch2/matchers/catch_matchers_string.hpp>
is <Progmasoft/Catch3/Matchers/String.hpp>, and interface headers are named
after their interface, such as Interfaces/IConfig.hpp. Include guards
became #pragma once. The installed headers go to include/Progmasoft.
src/Progmasoft/Context.cpp is StrategyContext.cpp, so no two sources share
a file name.
tools/scripts/upstreamFiles.txt lists the files that come from Catch2.
The license check expects BSL-1.0 on them and Progmasoft's header on the
rest of src/Progmasoft; the convenience-header check, the amalgamation
script and the surrogate tests take the engine's headers from it. The
amalgamated files are regenerated. The header-guard workflow checks for
#pragma once instead of checkguard.
Documents, the README and the release notes describe the new names.
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 53 |
1 files changed, 21 insertions, 32 deletions
diff --git a/premake5.lua b/premake5.lua index 316b4009..9f153d79 100644 --- a/premake5.lua +++ b/premake5.lua @@ -3,8 +3,8 @@ local repository_root = path.getabsolute(".") local generated_include = path.join(repository_root, "build", "premake", "generated") -local configure_catch2 = dofile(path.join(repository_root, "buildsupport", "catch2_config.lua")) -configure_catch2.generate(generated_include, repository_root) +local configure_catch3 = dofile(path.join(repository_root, "buildsupport", "catch3_config.lua")) +configure_catch3.generate(generated_include, repository_root) workspace "Catch3" location "build/premake" @@ -28,27 +28,33 @@ workspace "Catch3" runtime "Release" filter {} --- Catch2's engine with the Catch3 runner; the library is C++20, its headers --- need only C++14 in the code that includes them. -project "Catch2" +-- The Catch2-compatible engine, the Catch3 runner, property testing and +-- snapshots; the library is C++20, the engine's headers need only C++14 in +-- the code that includes them. +project "Catch3" kind "StaticLib" language "C++" cppdialect "C++20" targetdir "build/premake/bin/%{cfg.buildcfg}" - objdir "build/premake/obj/Catch2/%{cfg.buildcfg}" + objdir "build/premake/obj/Catch3/%{cfg.buildcfg}" files { - "src/catch2/**.cpp", - "src/catch2/**.hpp", + "src/Progmasoft/Catch3/**.cpp", "src/Progmasoft/Runner/*.cpp", "src/Progmasoft/Runner/*.hpp", "src/Progmasoft/Results.cpp", "src/Progmasoft/XmlWriter.cpp", - path.join(generated_include, "catch2", "catch_user_config.hpp"), + "src/Progmasoft/ChoiceShrinker.cpp", + "src/Progmasoft/StrategyContext.cpp", + "src/Progmasoft/PropertyEngine.cpp", + "src/Progmasoft/Snapshot.cpp", + "src/Progmasoft/Catch3/**.hpp", + "src/Progmasoft/Catch3.hpp", + path.join(generated_include, "Progmasoft", "Catch3", "UserConfig.hpp"), } - removefiles { "src/catch2/internal/catch_main.cpp" } + removefiles { "src/Progmasoft/Catch3/Internal/Main.cpp" } includedirs { "src", generated_include } -project "Catch2WithMain" +project "Catch3WithMain" kind "StaticLib" language "C++" cppdialect "C++14" @@ -56,27 +62,10 @@ project "Catch2WithMain" -- Catch2's wmain entry point instead of the normal console main. defines { "DO_NOT_USE_WMAIN" } targetdir "build/premake/bin/%{cfg.buildcfg}" - objdir "build/premake/obj/Catch2WithMain/%{cfg.buildcfg}" - files { "src/catch2/internal/catch_main.cpp" } - includedirs { "src", generated_include } - links { "Catch2" } - -project "ProgmasoftCatch3" - kind "StaticLib" - language "C++" - cppdialect "C++20" - targetdir "build/premake/bin/%{cfg.buildcfg}" - objdir "build/premake/obj/ProgmasoftCatch3/%{cfg.buildcfg}" - files { - "src/Progmasoft/ChoiceShrinker.cpp", - "src/Progmasoft/Context.cpp", - "src/Progmasoft/PropertyEngine.cpp", - "src/Progmasoft/Snapshot.cpp", - "src/Progmasoft/Catch3/**.hpp", - "src/Progmasoft/Catch3.hpp", - } + objdir "build/premake/obj/Catch3WithMain/%{cfg.buildcfg}" + files { "src/Progmasoft/Catch3/Internal/Main.cpp" } includedirs { "src", generated_include } - links { "Catch2" } + links { "Catch3" } project "ProgmasoftPropertyTests" kind "ConsoleApp" @@ -101,4 +90,4 @@ project "ProgmasoftPropertyTests" "src/Progmasoft/**.hpp", } includedirs { "src", generated_include } - links { "ProgmasoftCatch3", "Catch2WithMain", "Catch2" } + links { "Catch3WithMain", "Catch3" } |