From ed0f715b61e8d09e83f7bd5a01c096c22cca0cc8 Mon Sep 17 00:00:00 2001 From: Jonathan Grynspan Date: Wed, 17 Sep 2025 15:53:59 -0400 Subject: [PATCH 1/3] Fix the path to VERSION.txt used in CMake. Fixes a bug introduced in #1320. --- cmake/modules/shared/CompilerSettings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/shared/CompilerSettings.cmake b/cmake/modules/shared/CompilerSettings.cmake index df3bb826a..3c3c0d62c 100644 --- a/cmake/modules/shared/CompilerSettings.cmake +++ b/cmake/modules/shared/CompilerSettings.cmake @@ -43,7 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WASI") add_compile_definitions("SWT_NO_PIPES") endif() -file(STRINGS "../VERSION.txt" SWT_TESTING_LIBRARY_VERSION LIMIT_COUNT 1) +file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION.txt" SWT_TESTING_LIBRARY_VERSION LIMIT_COUNT 1) if(SWT_TESTING_LIBRARY_VERSION) message(STATUS "Swift Testing version: ${SWT_TESTING_LIBRARY_VERSION}") add_compile_definitions("$<$:SWT_TESTING_LIBRARY_VERSION=\"${SWT_TESTING_LIBRARY_VERSION}\">") From 245c4abfd92e5dd6507502755ca282e8d63fab44 Mon Sep 17 00:00:00 2001 From: Jonathan Grynspan Date: Wed, 17 Sep 2025 16:00:25 -0400 Subject: [PATCH 2/3] Path varies by 'project' --- CMakeLists.txt | 2 ++ Sources/TestingMacros/CMakeLists.txt | 2 ++ cmake/modules/shared/CompilerSettings.cmake | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f2828d49..f2d29d0d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,8 @@ if(POLICY CMP0157) endif() endif() +set(SWT_SOURCE_ROOT_DIR ${PROJECT_SOURCE_DIR}) + project(SwiftTesting LANGUAGES CXX Swift) diff --git a/Sources/TestingMacros/CMakeLists.txt b/Sources/TestingMacros/CMakeLists.txt index 9de696920..458bd4170 100644 --- a/Sources/TestingMacros/CMakeLists.txt +++ b/Sources/TestingMacros/CMakeLists.txt @@ -12,6 +12,8 @@ if(POLICY CMP0157) cmake_policy(SET CMP0157 NEW) endif() +set(SWT_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR}/../..) + project(TestingMacros LANGUAGES Swift) diff --git a/cmake/modules/shared/CompilerSettings.cmake b/cmake/modules/shared/CompilerSettings.cmake index 3c3c0d62c..e5a4fcbf6 100644 --- a/cmake/modules/shared/CompilerSettings.cmake +++ b/cmake/modules/shared/CompilerSettings.cmake @@ -43,7 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WASI") add_compile_definitions("SWT_NO_PIPES") endif() -file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION.txt" SWT_TESTING_LIBRARY_VERSION LIMIT_COUNT 1) +file(STRINGS "${SWT_SOURCE_ROOT_DIR}/VERSION.txt" SWT_TESTING_LIBRARY_VERSION LIMIT_COUNT 1) if(SWT_TESTING_LIBRARY_VERSION) message(STATUS "Swift Testing version: ${SWT_TESTING_LIBRARY_VERSION}") add_compile_definitions("$<$:SWT_TESTING_LIBRARY_VERSION=\"${SWT_TESTING_LIBRARY_VERSION}\">") From aa73895d3c496f9aa51d47b1bd8fba845bcd6d9d Mon Sep 17 00:00:00 2001 From: Jonathan Grynspan Date: Wed, 17 Sep 2025 16:02:48 -0400 Subject: [PATCH 3/3] Wrong path sigh --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2d29d0d6..3714e8c87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(POLICY CMP0157) endif() endif() -set(SWT_SOURCE_ROOT_DIR ${PROJECT_SOURCE_DIR}) +set(SWT_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR}) project(SwiftTesting LANGUAGES CXX Swift)