diff options
Diffstat (limited to 'Tests/RunCMake/CMakePackage')
4 files changed, 6 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake index 7d9d42a..ccf0a86 100644 --- a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake @@ -102,6 +102,9 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang") endif() apple_import(watchos watchOS "${watch_archs}" watchos) apple_import(ios-simulator iOS "${macos_archs}" iphonesimulator) + if(RunCMake_GENERATOR STREQUAL "Xcode") + apple_import(ios-simulator-xcode iOS "$(ARCHS_STANDARD)" iphonesimulator) + endif() if(select_archs) foreach(arch IN LISTS macos_archs) apple_import(ios-simulator-${arch} iOS "${arch}" iphonesimulator) diff --git a/Tests/RunCMake/CMakePackage/apple-export-ios-simulator-common.cmake b/Tests/RunCMake/CMakePackage/apple-export-ios-simulator-common.cmake index ab66407..c935c3a 100644 --- a/Tests/RunCMake/CMakePackage/apple-export-ios-simulator-common.cmake +++ b/Tests/RunCMake/CMakePackage/apple-export-ios-simulator-common.cmake @@ -9,7 +9,7 @@ if(IOS_SIMULATOR_SELECT_ARCHS) INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} SINGLE_ARCHITECTURES ${IOS_SIMULATOR_SELECT_ARCHS} SINGLE_ARCHITECTURE_INCLUDE_FILES ${IOS_SIMULATOR_SELECT_FILES} - UNIVERSAL_ARCHITECTURES ${IOS_SIMULATOR_SELECT_ARCHS} + UNIVERSAL_ARCHITECTURES ${IOS_SIMULATOR_SELECT_ARCHS} $(ARCHS_STANDARD) UNIVERSAL_INCLUDE_FILE "lib/ios-simulator/cmake/mylib/mylib-targets.cmake" ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mylib-select-arch-install.cmake DESTINATION lib/ios-simulator/cmake/mylib RENAME mylib-select-arch.cmake) diff --git a/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode-stdout.txt b/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode-stdout.txt new file mode 100644 index 0000000..4ca925d --- /dev/null +++ b/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode-stdout.txt @@ -0,0 +1 @@ +loaded: '[^']*/Tests/RunCMake/CMakePackage/apple-install/lib/ios-simulator/cmake/mylib/mylib-targets.cmake' diff --git a/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode.cmake b/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode.cmake new file mode 100644 index 0000000..90624a0 --- /dev/null +++ b/Tests/RunCMake/CMakePackage/apple-import-ios-simulator-xcode.cmake @@ -0,0 +1 @@ +include(apple-import-ios-simulator.cmake) |