mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-08 09:09:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

CMake: Refactor FindSwiftTesting to find TestingMacros dir on macOS

Browse source 
Turns out we need this directory to pass to the -frontend command
for creating the interop header, so refactor the whole find module
to find it on each platform.
This commit is contained in:
Andrew Kaster 2025-03-24 14:39:11 -06:00 • committed by Andrew Kaster
commit 1ed4e64575
Notes: github-actions[bot] 2025-04-03 22:49:11 +00:00
2 changed files with 63 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Meta/CMake/FindSwiftTesting.cmake
View file

@ -1,25 +1,60 @@
# Finds the swift-testing library # Finds the swift-testing library
# On Apple platforms, this is a framework included in the Xcode release # On Apple platforms, this is a framework included in the Xcode release
include_guard()
if (NOT TARGET SwiftTesting::SwiftTesting)
cmake_policy(PUSH)
if (POLICY CMP0152)
cmake_policy(SET CMP0152 NEW)
endif()
set(_SEARCH_PATHS "")
set(_PLUGIN_PATHS "")
foreach(path IN LISTS SWIFT_LIBRARY_SEARCH_PATHS)
file(REAL_PATH ${path} real_path)
if (EXISTS ${real_path})
list(APPEND _SEARCH_PATHS ${real_path})
if (EXISTS "${real_path}/testing")
list(APPEND _SEARCH_PATHS "${real_path}/testing")
endif()
endif()
if (EXISTS "${real_path}/../host/plugins")
file(REAL_PATH "${real_path}/../host/plugins" plugin_path)
list(APPEND _PLUGIN_PATHS ${plugin_path})
if (EXISTS "${plugin_path}/testing")
list(APPEND _PLUGIN_PATHS "${plugin_path}/testing")
endif()
endif()
endforeach()
list(REMOVE_DUPLICATES _SEARCH_PATHS)
list(REMOVE_DUPLICATES _PLUGIN_PATHS)
find_library(SWIFT_TESTING NAMES Testing find_library(SWIFT_TESTING NAMES Testing
PATHS ${SWIFT_LIBRARY_SEARCH_PATHS} PATHS ${_SEARCH_PATHS}
) )
if (SWIFT_TESTING) if (SWIFT_TESTING)
if (NOT TARGET SwiftTesting::SwiftTesting)
add_library(SwiftTesting::SwiftTesting IMPORTED UNKNOWN) add_library(SwiftTesting::SwiftTesting IMPORTED UNKNOWN)
message(STATUS "Found SwiftTesting: ${SWIFT_TESTING}") message(STATUS "Found SwiftTesting: ${SWIFT_TESTING}")
cmake_path(GET SWIFT_TESTING PARENT_PATH _SWIFT_TESTING_DIR) cmake_path(GET SWIFT_TESTING PARENT_PATH _SWIFT_TESTING_DIR)
find_library(SWIFT_TESTING_MACROS NAMES TestingMacros
PATHS ${_PLUGIN_PATHS}
NO_DEFAULT_PATH
)
if (NOT SWIFT_TESTING_MACROS)
message(FATAL_ERROR "Could not find associated TestingMacros plugin for ${SWIFT_TESTING}")
else()
message(VERBOSE "Found SwiftTesting macros: ${SWIFT_TESTING_MACROS}")
endif()
set_target_properties(SwiftTesting::SwiftTesting PROPERTIES set_target_properties(SwiftTesting::SwiftTesting PROPERTIES
IMPORTED_LOCATION "${SWIFT_TESTING}" IMPORTED_LOCATION "${SWIFT_TESTING}"
INTERFACE_LINK_DIRECTORIES "${_SWIFT_TESTING_DIR}" INTERFACE_LINK_DIRECTORIES "${_SWIFT_TESTING_DIR}"
INTERFACE_INCLUDE_DIRECTORIES "${_SWIFT_TESTING_DIR}"
INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-load-plugin-library ${SWIFT_TESTING_MACROS}>"
INTERFACE_LINK_OPTIONS "-load-plugin-library;${SWIFT_TESTING_MACROS}"
) )
if (UNIX AND NOT APPLE)
cmake_path(GET _SWIFT_TESTING_DIR PARENT_PATH _SWIFT_TESTING_TARGETLESS_DIR)
set_target_properties(SwiftTesting::SwiftTesting PROPERTIES
INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-load-plugin-library ${_SWIFT_TESTING_TARGETLESS_DIR}/host/plugins/libTestingMacros.so>"
INTERFACE_LINK_OPTIONS "-load-plugin-library;${_SWIFT_TESTING_TARGETLESS_DIR}/host/plugins/libTestingMacros.so"
)
endif()
endif()
set(SwiftTesting_FOUND TRUE) set(SwiftTesting_FOUND TRUE)
endif() endif()
cmake_policy(POP)
endif()

10
Meta/CMake/Swift/swift-settings.cmake
View file

@ -17,6 +17,8 @@ endif()
include(${CMAKE_CURRENT_LIST_DIR}/InitializeSwift.cmake) include(${CMAKE_CURRENT_LIST_DIR}/InitializeSwift.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/GenerateSwiftHeader.cmake) include(${CMAKE_CURRENT_LIST_DIR}/GenerateSwiftHeader.cmake)
find_package(SwiftTesting REQUIRED)
# FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/26174 # FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/26174
if (APPLE) if (APPLE)
set(CMAKE_Swift_COMPILER_TARGET "${SWIFT_TARGET_TRIPLE}") set(CMAKE_Swift_COMPILER_TARGET "${SWIFT_TARGET_TRIPLE}")
@ -60,6 +62,14 @@ function(add_swift_target_properties target_name)
get_target_property(_NATIVE_DIRS ${target_name} INCLUDE_DIRECTORIES) get_target_property(_NATIVE_DIRS ${target_name} INCLUDE_DIRECTORIES)
list(APPEND _NATIVE_DIRS ${CMAKE_Swift_MODULE_DIRECTORY}) list(APPEND _NATIVE_DIRS ${CMAKE_Swift_MODULE_DIRECTORY})
# Swift-testing in swift.org toolchains on macOS has its .swiftmodule in a testing/ subdirectory of
# the swift compiler's built-in lib dirs.
get_target_property(DEPENDENCIES ${target_name} LINK_LIBRARIES)
if (SwiftTesting::SwiftTesting IN_LIST DEPENDENCIES)
get_target_property(SWIFT_TESTING_INCLUDE_DIRS SwiftTesting::SwiftTesting INTERFACE_INCLUDE_DIRECTORIES)
list(APPEND _NATIVE_DIRS ${SWIFT_TESTING_INCLUDE_DIRS})
endif()
set(EXTRA_COMPILE_DEFINITIONS "") set(EXTRA_COMPILE_DEFINITIONS "")
foreach (compile_definition IN LISTS SWIFT_TARGET_COMPILE_DEFINITIONS) foreach (compile_definition IN LISTS SWIFT_TARGET_COMPILE_DEFINITIONS)
list(APPEND EXTRA_COMPILE_DEFINITIONS "-Xcc" "-D${compile_definition}") list(APPEND EXTRA_COMPILE_DEFINITIONS "-Xcc" "-D${compile_definition}")