diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-01-30 07:24:59 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-01-31 16:27:06 (GMT) |
| commit | d4297d5697cd10114f8accb7a233aa1f5ebc50ab (patch) | |
| tree | b9a893ac1653badd65099f3af9ead6e3c0d4fc63 /Tests/ExportImport | |
| parent | df4d2b28b24a3172daf1290070199633f7c46cf0 (diff) | |
| download | CMake-d4297d5697cd10114f8accb7a233aa1f5ebc50ab.zip CMake-d4297d5697cd10114f8accb7a233aa1f5ebc50ab.tar.gz CMake-d4297d5697cd10114f8accb7a233aa1f5ebc50ab.tar.bz2 | |
Export targets to a targets file, not a Config file.
Diffstat (limited to 'Tests/ExportImport')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index 47521d8..ae44c28 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -234,10 +234,10 @@ install(TARGETS testLibRequired testLibIncludeRequired6 testSharedLibRequired EXPORT RequiredExp DESTINATION lib ) -install(EXPORT RequiredExp NAMESPACE Req:: FILE testLibRequiredConfig.cmake DESTINATION lib/cmake/testLibRequired) +install(EXPORT RequiredExp NAMESPACE Req:: FILE testLibRequiredTargets.cmake DESTINATION lib/cmake/testLibRequired) install(TARGETS testLibDepends testSharedLibDepends EXPORT DependsExp DESTINATION lib ) -install(EXPORT DependsExp FILE testLibDependsConfig.cmake DESTINATION lib/cmake/testLibDepends) +install(EXPORT DependsExp FILE testLibDependsTargets.cmake DESTINATION lib/cmake/testLibDepends) # Install and export from install tree. diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt index e9bd2ba..0675594 100644 --- a/Tests/ExportImport/Import/A/CMakeLists.txt +++ b/Tests/ExportImport/Import/A/CMakeLists.txt @@ -5,8 +5,8 @@ include(${Import_BINARY_DIR}/../Export/ExportBuildTree.cmake) include(${CMAKE_INSTALL_PREFIX}/lib/exp/exp.cmake) # Import two exports, where the Depends one depends on an exported target from the Required one: -include(${CMAKE_INSTALL_PREFIX}/lib/cmake/testLibRequired/testLibRequiredConfig.cmake) -include(${CMAKE_INSTALL_PREFIX}/lib/cmake/testLibDepends/testLibDependsConfig.cmake) +include(${CMAKE_INSTALL_PREFIX}/lib/cmake/testLibRequired/testLibRequiredTargets.cmake) +include(${CMAKE_INSTALL_PREFIX}/lib/cmake/testLibDepends/testLibDependsTargets.cmake) # Try referencing an executable imported from the install tree. add_custom_command( |