summaryrefslogtreecommitdiff
path: root/Modules/FindJNI.cmake
Commit message (Collapse)AuthorAgeFilesLines
* FindJNI: add Ubuntu specific paths for more recent JDK versionsEven Rouault2023-05-011-0/+7
|
* FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSIONSergiu Deitsch2022-10-171-2/+2
| | | | | | | | | | | | | | | In commit 00c4f488f2 (FindJNI: support Android NDK, 2022-03-18, v3.24.0-rc1~325^2) we used `CMAKE_ANDROID_API` to check the Android API level. However, `CMAKE_SYSTEM_VERSION` is the authoritative value. When cross-compiling for Android, an unset `CMAKE_ANDROID_API` can result in failure to locate JNI because the `NativeHelper` component cannot be found. In this case, the component is falsely assumed to be available by default (and thus required) since the comparison against an unset `CMAKE_ANDROID_API` variable evaluates to true. Use `CMAKE_SYSTEM_VERSION` to determine the Android API level instead. Issue: #23830
* Merge branch 'backport-3.23-Java-version-handling' into Java-version-handlingMarc Chevrier2022-05-051-45/+30
|\
| * FindJava, FindJNI: ensure correct handling of versions on WindowsMarc Chevrier2022-05-051-45/+30
| | | | | | | | | | | | | | * versions are sorted in correct order * EXACT keyword is taken into account Fixes: #23479
* | FindJNI: support Android NDKSergiu Deitsch2022-04-051-14/+142
| |
* | FindJNI: added components and imported targetsSergiu Deitsch2022-04-041-25/+172
| |
* | FindJNI: improved descriptionSergiu Deitsch2022-04-041-9/+9
|/
* Modules: Fix typos and spelling in commentsJosef Angstenberger2021-05-071-1/+1
|
* FindJNI: Search in FreeBSD standard locationsAdriaan de Groot2020-10-071-0/+8
|
* FindJNI: Add aarch64 supportBrad King2020-09-251-1/+1
| | | | | | | Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support, 2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too. Fixes: #21237
* FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | | | On 64-bit ARM, JVM directories have an arm64 suffix.
* FindJava: ensure all versions can be foundMarc Chevrier2019-10-021-1/+1
| | | | Fixes: #19765
* FindJNI: Unify path search, fix support for Java 9Christian Pfeiffer2019-03-011-52/+47
| | | | | | | | | | | Java 9 restructured the standard location of the AWT libraries due to the removal of the JRE/JDK separation. We should check all possible combinations of subdirectories to the Java root directories to ensure that the libraries will be found after an upgrade. Furthermore, a root directory would contain both, include and library paths, so the search should be unified to ease maintenance on the module.
* FindJNI: Update module documentationBartosz Kosiorek2018-10-031-23/+43
|
* FindJNI: Add Ubuntu 18.04 path to java-11-openjdkBartosz Kosiorek2018-10-031-0/+1
|
* FindJava, FindJNI: fix erroneous regex, enhance registry lookupMarc Chevrier2018-05-071-2/+2
|
* FindJava, FindJNI: Ensure most recent version is searched firstMarc Chevrier2018-04-271-3/+15
|
* FindJava, FindJNI, UseJava: update for version 10 supportMarc Chevrier2018-04-251-13/+47
| | | | | | | * new version format * new registry layout on Windows Fixes: #17938
* FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
|
* Modules: Remove paths set as global Unix prefixesChristian Pfeiffer2017-11-201-4/+0
| | | | | This commit removes hardcoded paths that are already given in the platform files or in `UnixPath` on a global level.
* Fix trivial typos in textluzpaz2017-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces
* FindJNI: Add jvm paths for Arch LinuxKitsu2017-03-031-0/+5
|
* Merge topic 'simplify-license-notices'Brad King2016-09-281-13/+3
|\ | | | | | | | | | | | | | | | | | | | | | | 19671831 Help: Update cmake-developer(7) module license docs for new notice 756169ac Tests: Update ModuleNotices test for new notice 845d86bc Utilities/Scripts: Remove temporary script that filtered license notices 86578ecc Simplify CMake per-source license notices b7180cfe Utilities/Scripts: Add temporary script to filter license notices 7feb4ecc Copyright.txt: Add notice of copyright by contributors 78f77f60 Utilities/KWStyle: Remove unused header check reference file 681e0429 Tests: Fix RunCMake.CTest output match to tolerate line number changes
| * Simplify CMake per-source license noticesBrad King2016-09-271-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* | FindJNI: Add aarch32 path on armOrion Poplawski2016-09-271-1/+1
|/
* Merge topic 'FindJNI-cleanup'Brad King2016-07-061-2/+5
|\ | | | | | | | | 4e11c966 FindJNI: Improve formatting of FPHSA call
| * FindJNI: Improve formatting of FPHSA callO Libre2016-07-051-2/+5
| | | | | | | | Pass one argument per line for better readability.
* | FindJNI: Fix support for Ubuntu 15.10O Libre2016-07-051-3/+4
|/ | | | | The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI: Add support for Ubuntu 15.10, 2016-03-08) were incorrect. Fix them.
* FindJNI: Append path only "if(EXISTS"O. Libre2016-03-091-2/+6
|
* FindJNI: Add support for Ubuntu 15.10O. Libre2016-03-091-0/+9
| | | | | - Reuse JAVA_APPEND_LIBRARY_DIRECTORIES for JAVA_AWT_INCLUDE_DIRECTORIES - Append three directories /usr/lib/jvm/java-{8,7,6}-openjdk-{libarch}
* FindJNI: Add support for AIX java sdkMarc Chevrier2015-12-041-2/+4
|
* FindJNI: Add mips64(el) mipsn32(el) support (#15714)Yunqiang Su2015-08-281-1/+1
| | | | Submitted-by: Felix Geyer <fgeyer@debian.org>
* FindJNI: Add support for SuSE platform and IBM Java SDKMarc Chevrier2015-08-251-0/+8
|
* FindJNI: Add support for x32 architecture on Linux (#15710)Thorsten Glaser2015-08-241-0/+4
| | | | | This architecture uses an amd64 kernel but x32 userland. Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
* FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)Tiago Stürmer Daitx2015-02-181-0/+1
| | | | | JDK9's directory structure changes and no jdk/jre exists. The arch lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).
* FindJNI: search for ppc64 on ppc64le as wellDinar Valeev2014-07-011-1/+1
| | | | | | | IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI to look for both for backward compatibility. Signed-off-by: Dinar Valeev <dvaleev@suse.com>
* FindJNI: Add ppc64le architectureDinar Valeev2014-02-181-0/+2
| | | | Signed-off-by: Dinar Valeev <dvaleev@suse.com>
* FindJNI: Overhaul finding JDK libraries and headers on OS XBrad King2014-01-291-36/+56
| | | | | | | | | | | Drop the hard-coded framework paths and "-framework JavaJM" on APPLE. Save and restore the value of CMAKE_FIND_FRAMEWORK. Use its value to choose and order between a normal search for jvm&jawt and a framework search for JavaVM. When JAVA_HOME is set explicitly by the user then force a normal search by setting CMAKE_FIND_FRAMEWORK to NEVER. Once the library is found, set CMAKE_FIND_FRAMEWORK to help find_path locate the matching headers (framework v. normal).
* Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME}Brad King2014-01-291-2/+5
| | | | | | Add a helper module CMakeFindJavaCommon shared between FindJava and FindJNI to select a JAVA_HOME value. Prefer a CMake variable or cache entry first, then an environment variable.
* Find{Java,JNI}: Use ENV{JAVA_HOME} first when setBrad King2014-01-291-15/+20
| | | | | | Use list(APPEND) instead of set() to append to lists. When ENV{JAVA_HOME} is set explicitly place values based on it at the front their lists.
* FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)Joe Abbey2014-01-091-0/+1
|
* FindJNI: Support biarch installations (#14541)Modestas Vainius2013-11-041-2/+2
| | | | | | | | On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one while the system 32bit one. Take this into consideration while looking for Java library directory. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290
* Convert builtin help to reStructuredText source filesKitware Robot2013-10-151-11/+17
| | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDKAmit Kulkarni2012-12-041-0/+9
|
* Remove CMake-language block-end command argumentsKitware Robot2012-08-131-24/+24
| | | | | | | | | | | | | | | | | Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. Run the following shell code: for c in else endif endforeach endfunction endmacro endwhile; do echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | egrep -z -v 'Tests/CMakeTests/While-Endwhile-' | xargs -0 sed -i -f convert.sed && rm convert.sed
* Convert CMake-language commands to lower caseKitware Robot2012-08-131-97/+97
| | | | | | | | | | | | | | | | | Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code: cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | xargs -0 sed -i -f convert.sed && rm convert.sed
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-131-9/+9
| | | | | | | | | | | | | | | | | Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
* FindJNI: Search in Fedora arch-specific JVM location (#12276)Christoph Höger2011-06-151-0/+1
|
* Merge topic 'fixbug_0011183'Brad King2011-04-121-0/+1
|\ | | | | | | | | a59d198 Add support for java on fedora
| * Add support for java on fedoraMathieu Malaterre2011-04-081-0/+1
| | | | | | | | | | This commit fixes BUG: 0011183 by adding new paths used on fedora, specifically: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0
View Lorry Controller Status