Commit Graph

55 Commits

Author SHA1 Message Date
Rolf Eike Beer 8ebf74b02f Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the
installed version on the system is rather old this may even lead to bugs, e.g.
https://bugs.gentoo.org/show_bug.cgi?id=436540
2012-11-04 05:55:37 +01:00
Rolf Eike Beer b04650e163 use the find_* functions ENV parameter
Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR.
This will make sure the paths will get correctly handled through different
platforms, especially on Windows.

Also fixes one place where paths with windows delimiters (\) were hardcoded to
use forward slashes.
2012-08-14 21:02:58 +02:00
Kitware Robot 9db3116226 Remove CMake-language block-end command arguments
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
2012-08-13 14:19:16 -04:00
Kitware Robot 77543bde41 Convert CMake-language commands to lower case
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
2012-08-13 14:19:16 -04:00
Kitware Robot 7bbaa4283d Remove trailing whitespace from most CMake and C/C++ code
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/ \+$//'
2012-08-13 14:18:39 -04:00
David Cole 3948cb4fe4 Merge topic 'use-string-to-cmake-path'
3505e68 replace open coded versions of file(TO_CMAKE_PATH)
2012-06-21 11:54:14 -04:00
Rolf Eike Beer 3505e68466 replace open coded versions of file(TO_CMAKE_PATH) 2012-06-19 21:08:44 +02:00
Rolf Eike Beer e93ac6fbfe do not explicitely specify /usr and /usr/local as search paths
If not explicitely excluded these paths are searched automatically anyway.
2012-06-19 21:06:27 +02:00
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
Yaakov Selkowitz a6628d154a FindFLTK*: Use Cygwin fltk on Cygwin
Do not set FLTK_PLATFORM_DEPENDENT_LIBS to contain win32 libraries.
Cygwin builds should use the fltk that comes with Cygwin.
2010-09-21 17:29:22 -04:00
Todd Gamblin 2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -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 016d17f0cb ENH: change include command 2009-02-10 12:56:32 -05:00
Philip Lowman 138c445781 ENH: Better support for "fltk-config" binary, added options so the user
doesn't have to have everything in order for FLTK_FOUND to be true.  
2009-01-23 00:30:22 -05:00
Philip Lowman 7939529d0c BUG: Fixes detection of FLTK on Gentoo (Issue ) 2009-01-21 23:52:37 -05:00
Philip Lowman 570d6b4aa9 BUG: Fixes : FindFLTK fails because include file can be FL/Fl.H and CMake
only looks for FL/Fl.h.  Verified: all FLTK header files in 1.1.9 are .H ...
how bizarre.
2009-01-21 22:43:22 -05:00
Bill Hoffman d07a4675d2 ENH: fix find module stuff for test 2008-06-16 15:19:44 -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
Andy Cedilnik 2a7e0e7ad4 ENH: Replace with the one from InsightApp 2005-07-06 15:25:21 -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
Andy Cedilnik ad4f98f3cf ENH: Cleanup. Use relative path to modules 2004-08-26 22:52:53 -04:00
Bill Hoffman f929104ae8 BUG: put back flags to maintain backwards compatibility 2004-07-22 10:59:34 -04:00
Bill Hoffman 6ccbfe9795 clean up commands so they don't need extra variable 2004-06-16 09:44:03 -04:00
Bill Hoffman 88d644d2aa fix for bug 915 2004-06-14 10:36:17 -04:00
Bill Hoffman ebe116ee41 Fix for bug 903 change order of fltk libraries 2004-06-03 14:54:48 -04:00
Brad King f6e87dc2f6 ENH: Added /usr/local/lib/fltk 2003-04-04 10:05:20 -05:00
Brad King d78a4bab8c BUG: Removed use of cmake 1.4 compatability variable. 2003-02-19 17:10:08 -05:00
Bill Hoffman e44be57f6d ENH: change FIND_FILE to FIND_PROGRAM 2003-01-28 15:44:45 -05:00
Luis Ibanez b20d232855 FIX: Quotes added around the list of libs to be added in Apple. 2003-01-16 13:31:35 -05:00
Luis Ibanez e3f681937f ENH: Platform dependent libraries added for APPLE. 2003-01-16 13:24:49 -05:00
Bill Hoffman f519f14972 ENH: fix for borland and cygwin 2003-01-16 12:38:53 -05:00
Luis Ibanez 81c9994343 ENH: Libraries are not marked as ADVANCED now. 2003-01-15 18:28:14 -05:00
Luis Ibanez ec1b07015e ENH: description of variables now follows other style in other .cmake files. 2002-12-03 13:46:45 -05:00
Luis Ibanez 01efac63e2 ENH: FLTK 1.1.1 under Windows links now with the comctl32 library. 2002-11-28 23:45:27 -05:00
Luis Ibanez b013813f15 ENH: removed "USE_FLTK_VERSION_1.1" in favor of "FLTK_VERSION_1.1" to avoid
confusions.
2002-10-01 10:12:49 -04:00
Luis Ibanez af207d3166 ENH: Version 1.1 is considered to be the default. 2002-09-30 22:26:47 -04:00
Ian Scott 079e8469ab Hide lots of values in the advanced list
Fix some bugs
OpenGL always needs X11 on Unix
2002-09-05 12:00:45 -04:00
Ian Scott a89dbfc1b9 Moved FLTK and GTK to new FindXXX scheme. Imported some functionality from VXL 2002-09-02 17:34:45 -04:00
Luis Ibanez f035d0c0c5 ENH: Platform dependent libraries added. 2002-08-14 11:44:40 -04:00
Luis Ibanez 559d99e97d ENH: Images library added. Names for debuggin versions in windows added. 2002-08-05 18:08:46 -04:00
Luis Ibanez 596614e9aa FIX: names styles for fltkgl and fltkforms are different in windows and linux.
Both styles are now searched taking advantage of the NAMES option in
     FIND_LIBRARY.
2002-08-02 13:43:54 -04:00
Luis Ibanez 65afffa808 FIX: {} were missing around FLTK_*_LIBRARY. 2002-06-07 08:39:17 -04:00
Luis Ibanez ba0774deb8 FIX: The final test is done now over FLTK_LIBRARY instead of FLTK_LIBRARY_PATH 2002-06-06 17:49:54 -04:00
Luis Ibanez 2deb001881 ENH: Support for FLTK1.1 and FLTK1.0.11 added. An option allows to select
between the two versions.
2002-06-06 15:28:28 -04:00
Luis Ibanez 701f0d6413 ENH: HAS_FLTK variable added. FLTK_WRAP_UI command made INTERNAL. 2002-03-29 18:07:01 -05:00
Sebastien Barre 9c0eb4eeb8 ENH: mark everything ADVANCED 2001-12-20 15:45:51 -05:00