diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-31 15:50:31 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-31 10:50:38 -0500 |
| commit | 5107a84d46ad245221843adbef092118649e6dc7 (patch) | |
| tree | 843c7124775ceeba50ceff95b81990c6f7c230e2 /Tests | |
| parent | 9329e1e30ef4de637d0e71950933f1725f28b475 (diff) | |
| parent | f64099cf5e5a659340cf221dd32a6cfa8bfe47d3 (diff) | |
| download | cmake-5107a84d46ad245221843adbef092118649e6dc7.tar.gz | |
Merge topic 'restore-install-late-framework'
f64099cf5e Merge branch 'backport-restore-install-late-framework'
95210d027a macOS: Restore compatibility for setting FRAMEWORK after install()
d9dd68cb60 macOS: Restore compatibility for setting FRAMEWORK after install()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !2878
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Framework/InstallBeforeFramework-stderr.txt | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/Framework/InstallBeforeFramework.cmake | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/Framework/RunCMakeTest.cmake | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/Framework/InstallBeforeFramework-stderr.txt b/Tests/RunCMake/Framework/InstallBeforeFramework-stderr.txt new file mode 100644 index 0000000000..a3a7c6cbb6 --- /dev/null +++ b/Tests/RunCMake/Framework/InstallBeforeFramework-stderr.txt @@ -0,0 +1,7 @@ +^CMake Warning \(dev\) at InstallBeforeFramework.cmake:4 \(install\): + Target 'foo' was changed to a FRAMEWORK sometime after install\(\). This may + result in the wrong install DESTINATION. Set the FRAMEWORK property + earlier. +Call Stack \(most recent call first\): + CMakeLists.txt:[0-9]+ \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/Framework/InstallBeforeFramework.cmake b/Tests/RunCMake/Framework/InstallBeforeFramework.cmake new file mode 100644 index 0000000000..3791dace79 --- /dev/null +++ b/Tests/RunCMake/Framework/InstallBeforeFramework.cmake @@ -0,0 +1,5 @@ +enable_language(C) + +add_library(foo SHARED foo.c) +install(TARGETS foo LIBRARY DESTINATION lib) +set_property(TARGET foo PROPERTY FRAMEWORK TRUE) diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake index 4fc83f801d..e705a31fa1 100644 --- a/Tests/RunCMake/Framework/RunCMakeTest.cmake +++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake @@ -1,5 +1,7 @@ include(RunCMake) +run_cmake(InstallBeforeFramework) + function(framework_layout_test Name Toolchain Type) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkLayout-build) set(RunCMake_TEST_NO_CLEAN 1) |