diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-31 14:39:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-31 14:40:02 (GMT) |
| commit | c791fb12544926bc5870a61735dc2ec62940a6f6 (patch) | |
| tree | f4cfb4a96b5a855e259240511530425b38ff01fb /Tests/RunCMake/Framework/RunCMakeTest.cmake | |
| parent | 4a553ecb8e52dfd3ca605cd94ef8033e5febe937 (diff) | |
| parent | d1dac1acc502af2f2b766cc9b262a4f1294be39b (diff) | |
| download | CMake-c791fb12544926bc5870a61735dc2ec62940a6f6.zip CMake-c791fb12544926bc5870a61735dc2ec62940a6f6.tar.gz CMake-c791fb12544926bc5870a61735dc2ec62940a6f6.tar.bz2 | |
Merge topic '16733-bundle-genex'
d1dac1ac Xcode: Execute RunCMake.Framework also for Xcode generator
d02709d7 Genex: Add `TARGET_BUNDLE_[CONTENT_]_DIR` generator expressions
013ffe76 cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternal
32e9d0ca cmGeneratorTarget: Use enum to describe bundle directory query level
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !635
Diffstat (limited to 'Tests/RunCMake/Framework/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/Framework/RunCMakeTest.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake index e64892d..4fc83f8 100644 --- a/Tests/RunCMake/Framework/RunCMakeTest.cmake +++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake @@ -13,13 +13,10 @@ function(framework_layout_test Name Toolchain Type) run_cmake_command(${Name} ${CMAKE_COMMAND} --build .) endfunction() -# build check cannot cope with multi-configuration generators directory layout -if(NOT RunCMake_GENERATOR STREQUAL "Xcode") - framework_layout_test(iOSFrameworkLayout-build ios SHARED) - framework_layout_test(iOSFrameworkLayout-build ios STATIC) - framework_layout_test(OSXFrameworkLayout-build osx SHARED) - framework_layout_test(OSXFrameworkLayout-build osx STATIC) -endif() +framework_layout_test(iOSFrameworkLayout-build ios SHARED) +framework_layout_test(iOSFrameworkLayout-build ios STATIC) +framework_layout_test(OSXFrameworkLayout-build osx SHARED) +framework_layout_test(OSXFrameworkLayout-build osx STATIC) function(framework_type_test Toolchain Type) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkType-build) |