echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apple Text Stubs (.tbd): various fixes

Browse Source 
* ensure tapi lookup is applied only for concerned toolchains
* fix typos in tests

Fixes: #25182
This commit is contained in:
Marc Chevrier 2023-08-11 16:27:01 +02:00
parent f3d9a82110
commit 8b0f0dc257
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeFindBinUtils.cmake
View File

@ -229,7 +229,7 @@ if(NOT CMAKE_RANLIB)
set(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
endif()
if(NOT CMAKE_TAPI)
if(APPLE AND "TAPI" IN_LIST _CMAKE_TOOL_VARS AND NOT CMAKE_TAPI)
# try to pick-up from Apple toolchain
execute_process(COMMAND xcrun --find tapi
OUTPUT_VARIABLE _xcrun_out

12
Tests/RunCMake/AppleTextStubs/Framework-import.cmake
View File

@ -10,15 +10,15 @@ if (NOT is_framework)
message(SEND_ERROR "foo-build::foo: FRAMEWORK not set.")
endif()
get_property(enable_exports TARGET foo-install::foo PROPERTY ENABLE_EXPORTS)
if (CAMKE_TAPI AND NOT enable_exports)
if (CMAKE_TAPI AND NOT enable_exports)
message(SEND_ERROR "foo-install::foo: ENABLE_EXPORTS not set.")
endif()
get_property(implib TARGET foo-install::foo PROPERTY IMPORTED_IMPLIB_RELEASE)
if (CAMKE_TAPI AND NOT implib)
if (CMAKE_TAPI AND NOT implib)
message(SEND_ERROR "foo-install::foo: IMPORTED_IMPLIB_RELEASE not set.")
endif()
if (CAMKE_TAPI AND NOT implib MATCHES "foo.framework/Versions/A/foo.tbd$")
if (CMAKE_TAPI AND NOT implib MATCHES "foo.framework/Versions/A/foo.tbd$")
message(SEND_ERROR "foo-install::foo: ${implib}: wrong value for IMPORTED_IMPLIB_RELEASE.")
endif()
@ -41,15 +41,15 @@ if (NOT is_framework)
message(SEND_ERROR "foo-build::foo: FRAMEWORK not set.")
endif()
get_property(enable_exports TARGET foo-build::foo PROPERTY ENABLE_EXPORTS)
if (CAMKE_TAPI AND NOT enable_exports)
if (CMAKE_TAPI AND NOT enable_exports)
message(SEND_ERROR "foo-build::foo: ENABLE_EXPORTS not set.")
endif()
get_property(implib TARGET foo-build::foo PROPERTY IMPORTED_IMPLIB_RELEASE)
if (CAMKE_TAPI AND NOT implib)
if (CMAKE_TAPI AND NOT implib)
message(SEND_ERROR "foo-build::foo: IMPORTED_IMPLIB_RELEASE not set.")
endif()
if (CAMKE_TAPI AND NOT implib STREQUAL "${foo_BUILD}/foo.framework/Versions/A/foo.tbd")
if (CMAKE_TAPI AND NOT implib STREQUAL "${foo_BUILD}/foo.framework/Versions/A/foo.tbd")
message(SEND_ERROR "foo-build::foo: ${implib}: wrong value for IMPORTED_IMPLIB_RELEASE.")
endif()