diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-12 11:00:41 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-13 14:12:31 (GMT) |
| commit | 79ae968a18ea58219df419a4add55f054889be31 (patch) | |
| tree | 7965d602033ef680833184075ca766f1c9060b29 /Tests/ExportImport | |
| parent | 71bf96ec78afef09dc0b927f6dcebeb9b3208db1 (diff) | |
| download | CMake-79ae968a18ea58219df419a4add55f054889be31.zip CMake-79ae968a18ea58219df419a4add55f054889be31.tar.gz CMake-79ae968a18ea58219df419a4add55f054889be31.tar.bz2 | |
Revert "Add a way to exclude INTERFACE properties from exported targets."
This reverts commit 2c3654c3de718fe822f8960063373774fc019494.
The removal of some tests added in commit 77cecb77 (Add includes and compile
definitions with target_link_libraries., 2012-11-05) are also squashed
into this commit.
Diffstat (limited to 'Tests/ExportImport')
4 files changed, 0 insertions, 76 deletions
diff --git a/Tests/ExportImport/Import/CMakeLists.txt b/Tests/ExportImport/Import/CMakeLists.txt index 237f8fa..3fc78a2 100644 --- a/Tests/ExportImport/Import/CMakeLists.txt +++ b/Tests/ExportImport/Import/CMakeLists.txt @@ -17,8 +17,3 @@ add_executable(imp_testTransExe1 imp_testTransExe1.c) target_link_libraries(imp_testTransExe1 imp_lib1) add_executable(imp_testTransExe1b imp_testTransExe1.c) target_link_libraries(imp_testTransExe1b imp_lib1b) - -# Test package INTERFACE controls -add_subdirectory(package_old_old) -add_subdirectory(package_new_old) -add_subdirectory(package_new_new) diff --git a/Tests/ExportImport/Import/package_new_new/CMakeLists.txt b/Tests/ExportImport/Import/package_new_new/CMakeLists.txt deleted file mode 100644 index 4e6f642..0000000 --- a/Tests/ExportImport/Import/package_new_new/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -find_package(testLibRequired 2.5 REQUIRED) - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp" - " -#include \"testSharedLibRequired.h\" -int main(int argc, char **argv) -{ - TestSharedLibRequired req; - return req.foo(); -} -" -) - -get_target_property(prop Req::testSharedLibRequired INTERFACE_INCLUDE_DIRECTORIES) -if (NOT prop) - message(SEND_ERROR "Interface of Req::testSharedLibRequired should not be empty") -endif() - -add_executable(new_new_test "${CMAKE_CURRENT_BINARY_DIR}/main.cpp") -target_link_libraries(new_new_test Req::testSharedLibRequired) diff --git a/Tests/ExportImport/Import/package_new_old/CMakeLists.txt b/Tests/ExportImport/Import/package_new_old/CMakeLists.txt deleted file mode 100644 index e675d64..0000000 --- a/Tests/ExportImport/Import/package_new_old/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -find_package(testLibRequired 2.5 REQUIRED) - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp" - " -#include \"testSharedLibRequired.h\" -int main(int argc, char **argv) -{ - TestSharedLibRequired req; - return req.foo(); -} -" -) - -get_target_property(prop Req::testSharedLibRequired INTERFACE_INCLUDE_DIRECTORIES) -if ("${prop}" STREQUAL "") - message(SEND_ERROR "Interface of Req::testSharedLibRequired should not be empty") -endif() - -add_executable(new_old_test "${CMAKE_CURRENT_BINARY_DIR}/main.cpp") -target_link_libraries(new_old_test Req::testSharedLibRequired) -include_directories(${testLibRequired_INCLUDE_DIRS}) diff --git a/Tests/ExportImport/Import/package_old_old/CMakeLists.txt b/Tests/ExportImport/Import/package_old_old/CMakeLists.txt deleted file mode 100644 index 3b27330..0000000 --- a/Tests/ExportImport/Import/package_old_old/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -find_package(testLibRequired 2.1 REQUIRED) - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp" - " -#include \"testSharedLibRequired.h\" -int main(int argc, char **argv) -{ - TestSharedLibRequired req; - return req.foo(); -} -" -) - -get_target_property(prop Req::testSharedLibRequired INTERFACE_INCLUDE_DIRECTORIES) -if (prop) - message(SEND_ERROR "Interface of Req::testSharedLibRequired should be empty, but is ${prop}") -endif() - -add_executable(old_old_test "${CMAKE_CURRENT_BINARY_DIR}/main.cpp") -target_link_libraries(old_old_test Req::testSharedLibRequired) -include_directories(${testLibRequired_INCLUDE_DIRS}) |