diff options
| author | makise-homura <akemi_homura@kurisa.ch> | 2022-06-22 23:08:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-28 15:12:04 (GMT) |
| commit | 070e217399781e8cacec4d5e171fa1dd923ac9ce (patch) | |
| tree | 52c476cb1ab759712795e6e342b7cead45f7bb97 /Tests/CMakeLists.txt | |
| parent | 7545d1ca9f9db2cd828494bb9e571f953636c0be (diff) | |
| download | CMake-070e217399781e8cacec4d5e171fa1dd923ac9ce.zip CMake-070e217399781e8cacec4d5e171fa1dd923ac9ce.tar.gz CMake-070e217399781e8cacec4d5e171fa1dd923ac9ce.tar.bz2 | |
Tests: enable Java tests if javac is a recurse symlink
There are distros (OS Elbrus 6.x, 7.x, Ubuntu 21.x)
where javac is a recurse symlink, like /usr/bin/javac ->
/etc/alternatives/javac -> /usr/lib/jvm/.../bin/javac.
On these distros, Java tests were not run, because
Tests/CMakeLists.txt was not able to handle this case
correctly. Now an additional stage of resolving symlinks
is added, and these distros have Java tests running.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b0fb24d..8485f85 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3371,7 +3371,8 @@ if(BUILD_TESTING) 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_JAVAC_EXECUTABLE} PATH) + get_filename_component(JAVACPATH ${Java_JAVAC_EXECUTABLE} REALPATH) + get_filename_component(JNIPATH ${JAVACPATH} PATH) find_file(JNI_H jni.h "${JNIPATH}/../include" "${JNIPATH}/../java/include") |