diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-27 13:10:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-27 13:10:30 (GMT) |
| commit | 34a5163fecebf86d93277830a673fabdd53da82c (patch) | |
| tree | fb8ac1028be325675c8f759dc5514cdc5d1f0dcc /Tests | |
| parent | e55c86873e87ef464b49bec944948273ce38e4ca (diff) | |
| parent | 2ae72ef74b1a8b3034c4685de68f39d1e198a84c (diff) | |
| download | CMake-34a5163fecebf86d93277830a673fabdd53da82c.zip CMake-34a5163fecebf86d93277830a673fabdd53da82c.tar.gz CMake-34a5163fecebf86d93277830a673fabdd53da82c.tar.bz2 | |
Merge topic 'xcode-link-TARGET_OBJECTS'
2ae72ef74b Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6161
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/add_executable/RunCMakeTest.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/add_library/RunCMakeTest.cmake | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Tests/RunCMake/add_executable/RunCMakeTest.cmake b/Tests/RunCMake/add_executable/RunCMakeTest.cmake index 88916b7..70a68f2 100644 --- a/Tests/RunCMake/add_executable/RunCMakeTest.cmake +++ b/Tests/RunCMake/add_executable/RunCMakeTest.cmake @@ -2,6 +2,4 @@ include(RunCMake) run_cmake(NoSources) run_cmake(OnlyObjectSources) -if(NOT RunCMake_GENERATOR STREQUAL "Xcode" OR NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" MATCHES "[;$]") - run_cmake(NoSourcesButLinkObjects) -endif() +run_cmake(NoSourcesButLinkObjects) diff --git a/Tests/RunCMake/add_library/RunCMakeTest.cmake b/Tests/RunCMake/add_library/RunCMakeTest.cmake index dfadb8f..3283625 100644 --- a/Tests/RunCMake/add_library/RunCMakeTest.cmake +++ b/Tests/RunCMake/add_library/RunCMakeTest.cmake @@ -16,11 +16,9 @@ run_cmake(SHAREDwithOnlyObjectSources) run_cmake(MODULEwithOnlyObjectSources) run_cmake(UNKNOWNwithOnlyObjectSources) -if(NOT RunCMake_GENERATOR STREQUAL "Xcode" OR NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" MATCHES "[;$]") - run_cmake(INTERFACEwithNoSourcesButLinkObjects) - run_cmake(OBJECTwithNoSourcesButLinkObjects) - run_cmake(STATICwithNoSourcesButLinkObjects) - run_cmake(SHAREDwithNoSourcesButLinkObjects) - run_cmake(MODULEwithNoSourcesButLinkObjects) - run_cmake(UNKNOWNwithNoSourcesButLinkObjects) -endif() +run_cmake(INTERFACEwithNoSourcesButLinkObjects) +run_cmake(OBJECTwithNoSourcesButLinkObjects) +run_cmake(STATICwithNoSourcesButLinkObjects) +run_cmake(SHAREDwithNoSourcesButLinkObjects) +run_cmake(MODULEwithNoSourcesButLinkObjects) +run_cmake(UNKNOWNwithNoSourcesButLinkObjects) |