summaryrefslogtreecommitdiffstats
path: root/Modules/FindJNI.cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Add support for FindJava on HP-UX and alphaMathieu Malaterre2011-04-081-0/+2
|/ | | | | This commit fixes BUG: 0010242. It now properly inspect specific directory on hp-ux and alpha implementation of the JRE
* Modules: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindPackageHandleStandardArgs module was originally created outside of CMake. It was added for CMake 2.6.0 by commit e118a627 (add a macro FIND_PACKAGE_HANDLE_STANDARD_ARGS..., 2007-07-18). However, it also proliferated into a number of other projects that at the time required only CMake 2.4 and thus could not depend on CMake to provide the module. CMake's own find modules started using the module in commit b5f656e0 (use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX modules..., 2007-07-18). Then commit d358cf5c (add 2nd, more powerful mode to find_package_handle_standard_args, 2010-07-29) added a new feature to the interface of the module that was fully optional and backward compatible with all existing users of the module. Later commit 5f183caa (FindZLIB: use the FPHSA version mode, 2010-08-04) and others shortly thereafter started using the new interface in CMake's own find modules. This change was also backward compatible because it was only an implementation detail within each module. Unforutnately these changes introduced a problem for projects that still have an old copy of FindPackageHandleStandardArgs in CMAKE_MODULE_PATH. When any such project uses one of CMake's builtin find modules the line include(FindPackageHandleStandardArgs) loads the copy from the project which does not have the new interface! Then the including find module tries to use the new interface with the old module and fails. Whether this breakage can be considered a backward incompatible change in CMake is debatable. The situation is analagous to copying a standard library header from one version of a compiler into a project and then observing problems when the next version of the compiler reports errors in its other headers that depend on its new version of the original header. Nevertheless it is a change to CMake that causes problems for projects that worked with previous versions. This problem was discovered during the 2.8.3 release candidate cycle. It is an instance of a more general problem with projects that provide their own versions of CMake modules when other CMake modules depend on them. At the time we resolved this instance of the problem with commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28) for the 2.8.3 release. In order to address the more general problem we introduced policy CMP0017 in commit db44848f (Prefer files from CMAKE_ROOT when including from CMAKE_ROOT, 2010-11-17). That change was followed by commit ce28737c (Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017, 2010-12-20) which reverted the original workaround in favor of using the policy. However, existing project releases do not set the policy behavior to NEW and therefore still exhibit the problem. We introduced in commit a364daf1 (Allow users to specify defaults for unset policies, 2011-01-03) an option for users to build existing projects by adding -DCMAKE_POLICY_DEFAULT_CMP0017=NEW to the command line. Unfortunately this solution still does not allow such projects to build out of the box, and there is no good way to suggest the use of the new option. The only remaining solution to keep existing projects that exhibit this problem building is to restore the change originally made in commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28). This also avoids policy CMP0017 warnings for this particular instance of the problem the policy addresses.
* Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017Alex Neundorf2011-01-041-1/+1
| | | | | | | | This puts the new search behaviour for included files in action, i.e. now when a file from Modules/ include()s another file, it also gets the one from Modules/ included, i.e. the one it expects. Alex
* Use absolute path to FindPackageHandleStandardArgs.cmake everywhereAlex Neundorf2010-09-281-1/+1
| | | | | | | This is to avoid getting an (older) copy of FPHSA.cmake which is e.g. installed with KDE 4.5.0 and 4.5.1. Alex
* Modules: Fix spelling 'To distributed' -> 'To distribute'Todd Gamblin2010-08-091-1/+1
|
* BUG: 0009611 Fix Arch independent FindJNI.cmake on LinuxMathieu Malaterre2010-07-301-18/+43
|
* -handle the REQUIRED and QUIET keywords in FindJNI.cmake, also set JNI_FOUNDAlexander Neundorf2009-12-211-0/+5
| | | | Alex
* BUG: 0009817 cmake does not search in solaris subdirectory for ↵Mathieu Malaterre2009-11-021-0/+1
| | | | JAVA_INCLUDE_PATH2. Thanks to Gaetan Lehmann for patch
* Fix for bug #9793 try to make sure jni.h matches jni_md.hBill Hoffman2009-10-291-2/+1
|
* Fix for bug#9686 convert java_home to a cmake path before using.Bill Hoffman2009-10-221-5/+8
|
* Fix for bug #9611, some more paths for OpenJDK.Bill Hoffman2009-09-301-1/+5
|
* Fix for bug #9611 do not hard code archs for search paths of java, look at ↵Bill Hoffman2009-09-301-35/+52
| | | | the machine type.
* Convert CMake find-modules to BSD LicenseBrad King2009-09-281-0/+13
| | | | | | | This adds copyright/license notification blocks CMake's find-modules. Many of the modules had no notices at all. Some had notices referring to the BSD license already. This commit normalizes existing notices and adds missing notices.
* Bug #09476, add more search paths for jni.Bill Hoffman2009-09-161-1/+12
|
* ENH: add even more search directories for debian-like systems (see #8821)Alexander Neundorf2009-04-211-2/+8
| | | | Alex
* ENH: add one more search directory (see #8919)Alexander Neundorf2009-04-211-0/+1
| | | | Alex
* BUG: #7333, search dirs for FedoraAlexander Neundorf2008-07-201-0/+2
| | | | Alex
* BUG: #7360: add support for FreeBSDAlexander Neundorf2008-07-201-1/+8
| | | | | | BUG: #7345: add support for ppc Alex
* BUG: fix #6416: provide JNI_LIBRARIES and JNI_INCLUDE_DIRSAlexander Neundorf2008-07-201-3/+20
| | | | Alex
* ENH: have jni look more places on linuxBill Hoffman2008-04-081-1/+2
|
* BUG: Eliminate message - it pops up an annoying dialog whenever you run ↵David Cole2008-01-161-1/+0
| | | | CMakeSetup in a project with java wrapping turned on.