diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-09 13:18:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-09 13:18:17 (GMT) |
| commit | 5aa89a1ae0554c8bf428d079a0a716e9254e516f (patch) | |
| tree | 671eaf97f597eacf6ca7b88a31c41be81f3245f2 /Tests/CMakeLists.txt | |
| parent | 39699947589e96b59d7f56d9c0b1dcb1bef27f8a (diff) | |
| parent | 0bd91ad4058c006bb67b48801e1877e8a893ef4d (diff) | |
| download | CMake-5aa89a1ae0554c8bf428d079a0a716e9254e516f.zip CMake-5aa89a1ae0554c8bf428d079a0a716e9254e516f.tar.gz CMake-5aa89a1ae0554c8bf428d079a0a716e9254e516f.tar.bz2 | |
Merge topic 'java-export-targets'
0bd91ad4 UseJava: Fix race condition creating java class list
89df91b9 Help: Add notes for topic 'java-export-targets'
95d84369 Tests: Add test for exported JARs
5341c0d8 UseJava: Add infrastructure to export targets
d91ec044 Tests/Java: Clean up style of Java test code
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index bb24b33..5911682 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3108,6 +3108,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release find_package(Java COMPONENTS Development QUIET) if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE AND Java_JAR_EXECUTABLE AND NOT MINGW AND NOT "${CMAKE_GENERATOR}" MATCHES "Xcode") + + set(JavaExportImport_BUILD_OPTIONS -DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}) + ADD_TEST_MACRO(JavaExportImport JavaExportImport) + get_filename_component(JNIPATH ${JAVA_COMPILE} PATH) find_file(JNI_H jni.h "${JNIPATH}/../include" |