Commit Graph

53 Commits

Author SHA1 Message Date
Brad King c4275592a8 Modules: Include builtin FindPackageHandleStandardArgs directly
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.
2011-01-20 10:56:49 -05:00
Alex Neundorf ce28737c93 Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017
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
2011-01-04 08:20:08 -05:00
Alex Neundorf b01184022b Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
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
2010-09-28 22:30:31 +02:00
Todd Gamblin 2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Mathieu Malaterre 963921f2a8 BUG: 0009611 Fix Arch independent FindJNI.cmake on Linux 2010-07-30 10:19:42 +02:00
Alexander Neundorf c424267cc1 -handle the REQUIRED and QUIET keywords in FindJNI.cmake, also set JNI_FOUND
Alex
2009-12-21 15:56:05 -05:00
Mathieu Malaterre 865e0a11b4 BUG: 0009817 cmake does not search in solaris subdirectory for JAVA_INCLUDE_PATH2. Thanks to Gaetan Lehmann for patch 2009-11-02 04:03:06 -05:00
Bill Hoffman e183581b14 Fix for bug #9793 try to make sure jni.h matches jni_md.h 2009-10-29 13:48:32 -04:00
Bill Hoffman e1c1ab7197 Fix for bug#9686 convert java_home to a cmake path before using. 2009-10-22 06:57:00 -04:00
Bill Hoffman 122c7f6179 Fix for bug #9611, some more paths for OpenJDK. 2009-09-30 14:15:23 -04:00
Bill Hoffman b5bc1d9f74 Fix for bug #9611 do not hard code archs for search paths of java, look at the machine type. 2009-09-30 09:59:00 -04:00
Brad King c4bb9c9d42 Convert CMake find-modules to BSD License
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.
2009-09-28 11:45:50 -04:00
Bill Hoffman 72f524efc1 Bug #09476, add more search paths for jni. 2009-09-16 14:20:20 -04:00
Alexander Neundorf f1149df8cf ENH: add even more search directories for debian-like systems (see #8821)
Alex
2009-04-21 17:12:32 -04:00
Alexander Neundorf e16d1e37f3 ENH: add one more search directory (see #8919)
Alex
2009-04-21 17:09:29 -04:00
Alexander Neundorf fdd99aa361 BUG: #7333, search dirs for Fedora
Alex
2008-07-20 15:50:13 -04:00
Alexander Neundorf ef2424c9da BUG: #7360: add support for FreeBSD
BUG: #7345: add support for ppc

Alex
2008-07-20 15:45:49 -04:00
Alexander Neundorf f889f9e35f BUG: fix #6416: provide JNI_LIBRARIES and JNI_INCLUDE_DIRS
Alex
2008-07-20 15:39:02 -04:00
Bill Hoffman 7dcbe5e1f5 ENH: have jni look more places on linux 2008-04-08 16:09:36 -04:00
David Cole a5ac316155 BUG: Eliminate message - it pops up an annoying dialog whenever you run CMakeSetup in a project with java wrapping turned on. 2008-01-16 10:04:36 -05:00
Bill Hoffman d6bf2457a7 BUG: fix for 5933, look for java in more reg entries 2007-12-17 17:22:51 -05:00
Bill Hoffman 2803688998 BUG: fix for bug 4605 2007-04-04 13:43:12 -04:00
Andy Cedilnik c074927b41 ENH: Support JVM on Mac 2006-12-26 08:47:15 -05:00
Andy Cedilnik e29b587d59 ENH: More documentation 2006-10-27 17:30:26 -04:00
Andy Cedilnik 9ae7fb964c ENH: Add support for libjvm 2006-10-27 17:29:05 -04:00
Bill Hoffman f23ade5c02 ENH: remove JavaEmbedding 2006-10-27 15:59:40 -04:00
Bill Hoffman ae5df56bbc ENH: remove JavaEmbedding framework 2006-10-24 10:03:39 -04:00
Andy Cedilnik e607d5f7df ENH: More locations for Java 2006-10-12 13:12:37 -04:00
Ken Martin d2689c95a1 ENH: some style fixes for the book 2005-12-15 10:41:19 -05:00
Bill Hoffman b7fa820118 ENH: add documentation support for modules 2005-12-14 13:51:08 -05:00
Bill Hoffman 1d031367d9 ENH: java fixes from Mathieu 2005-09-23 14:38:51 -04:00
Bill Hoffman bcd62c8091 ENH: add support for java 1.5 2005-09-08 10:03:51 -04:00
Andy Cedilnik d604f5f625 STYLE: Fix typo 2005-08-03 13:19:22 -04:00
Brad King 290ffc01b6 ENH: Removing extra 64-bit search paths. They are now constructed automatically from the paths listed. 2005-04-07 14:27:01 -04:00
Brad King 76f9050026 ENH: Adding support for 64-bit library paths. Contributed by Peter Vanroose. 2005-04-07 13:46:02 -04:00
Bill Hoffman aa947ff48b ENH: bug fix 1573 2005-02-09 22:46:33 -05:00
Andy Cedilnik f171b82377 ENH: Better finding of JNI 2004-02-06 10:49:46 -05:00
Sebastien Barre 296e731808 FIX: for Windows users, it seems logical to favor native win32 installation before Cygwin ones. Otherwise you can end up with bad mixes (part of the java tools were picked from the SDK, part from Cygwin) 2003-10-16 11:05:04 -04:00
Andy Cedilnik fd89ebbbaf Ok, now it finds JNI on Mac OSX 10.2 2003-02-11 14:49:11 -05:00
Andy Cedilnik 5a31a94f84 Fix typo 2003-02-11 13:56:35 -05:00
Andy Cedilnik a6c2c80757 Add missing location 2003-02-11 13:53:30 -05:00
Andy Cedilnik 8e105e0a9f Improve searching for java files on OSX 2003-02-11 13:37:19 -05:00
Andy Cedilnik 2281726935 Clean find for Python, add find for python 2.2 on windows, cleanup java on windows and add java 1.4 support 2002-11-14 09:38:45 -05:00
Brad King 6bdf15c4de ENH: Added /usr/local/lib/java search paths. 2002-07-15 09:22:17 -04:00
Andy Cedilnik f844304465 Add debian Java paths 2002-06-17 13:43:21 -04:00
Sebastien Barre d98cafb684 ENH: Make everything ADVANCED 2001-12-19 21:51:39 -05:00
Ken Martin ccec141974 bad spelling of java 2001-12-18 16:21:54 -05:00
Brad King c5381e8588 ENH: Added support for using backslash-style escaping in CMakeLists.txt file arguments. This allows double quotes to be used in arguments. 2001-07-17 09:54:05 -04:00
Ken Martin d84a68d067 better tests 2001-06-06 09:43:54 -04:00
Ken Martin 4139f15de6 minor fixes and new python module 2001-05-11 10:27:46 -04:00