diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-24 13:35:25 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-24 09:35:29 -0400 |
| commit | 3ade7a306e0d002a6bfc89b20b7b1483643877ea (patch) | |
| tree | 2555bf1a16c791daff57f68afdd4214dc9e1c4b7 /Tests | |
| parent | aaeb01ef9bfa600e072be79792be53186c395a8c (diff) | |
| parent | 0bee006602f07e26d052ba30541e6ce61a621b63 (diff) | |
| download | cmake-3ade7a306e0d002a6bfc89b20b7b1483643877ea.tar.gz | |
Merge topic 'namespace-jar-exports'
0bee0066 Tests: Test namespaces with exported JARs
789c8de3 UseJava: Support namespaced exports
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !729
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/JavaExportImport/BuildExport/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/JavaExportImport/Import/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/JavaExportImport/InstallExport/CMakeLists.txt | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Tests/JavaExportImport/BuildExport/CMakeLists.txt b/Tests/JavaExportImport/BuildExport/CMakeLists.txt index 953f9d0058..fa7e5016de 100644 --- a/Tests/JavaExportImport/BuildExport/CMakeLists.txt +++ b/Tests/JavaExportImport/BuildExport/CMakeLists.txt @@ -7,4 +7,7 @@ find_package(Java COMPONENTS Development) include(UseJava) add_jar(${PROJECT_NAME} Foo.java) -export_jars(TARGETS ${PROJECT_NAME} FILE JavaBuildExportTestConfig.cmake) +export_jars( + TARGETS ${PROJECT_NAME} + NAMESPACE foo:: + FILE JavaBuildExportTestConfig.cmake) diff --git a/Tests/JavaExportImport/Import/CMakeLists.txt b/Tests/JavaExportImport/Import/CMakeLists.txt index 79a14477a1..13ec05dc4e 100644 --- a/Tests/JavaExportImport/Import/CMakeLists.txt +++ b/Tests/JavaExportImport/Import/CMakeLists.txt @@ -11,4 +11,4 @@ find_package(JavaInstallExportTest REQUIRED) add_jar(${PROJECT_NAME} SOURCES Import.java - INCLUDE_JARS foo bar) + INCLUDE_JARS foo::foo bar::bar) diff --git a/Tests/JavaExportImport/InstallExport/CMakeLists.txt b/Tests/JavaExportImport/InstallExport/CMakeLists.txt index 0a9afd9cf2..2923bebb2a 100644 --- a/Tests/JavaExportImport/InstallExport/CMakeLists.txt +++ b/Tests/JavaExportImport/InstallExport/CMakeLists.txt @@ -10,5 +10,6 @@ add_jar(${PROJECT_NAME} Bar.java) install_jar(${PROJECT_NAME} DESTINATION share/java) install_jar_exports( TARGETS ${PROJECT_NAME} + NAMESPACE bar:: FILE JavaInstallExportTestConfig.cmake DESTINATION share/cmake) |