Browse Source

Merge topic 'TAPI-is-Apple-only' into release-3.27

8b0f0dc257 Apple Text Stubs (.tbd): various fixes

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8708
Brad King 2 years ago
parent
commit
955d2b8847

+ 1 - 1
Modules/CMakeFindBinUtils.cmake

@@ -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

+ 6 - 6
Tests/RunCMake/AppleTextStubs/Framework-import.cmake

@@ -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()