Commit Graph

2739 Commits

Author SHA1 Message Date
Clinton Stimpson de0485459c Force cmake to run again when qrc dependency scanning needs to happen. 2010-10-15 16:46:39 -06:00
Clinton Stimpson cfba5ef111 Fix regression in 2dae2f1 which added find of Qt imports dir. 2010-10-15 16:36:14 -06:00
David Cole e2476232c0 Merge topic 'FindBoost_bugfix_cleanup'
b867a3f Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
2010-10-12 11:12:16 -04:00
David Cole e4508ac82f Merge topic 'FindHDF5-is-parallel'
3445532 FindHDF5: Fix typo in parallel-IO support check (#11291)
2010-10-12 11:12:00 -04:00
David Cole 0ecc8a409c Merge topic 'findmpi-msmpi-update'
35d2770 Update module to locate newely released MS MPI HPC Pack R2.
2010-10-12 11:11:47 -04:00
David Cole b14764c29c Merge topic 'qt4-imports-dir'
2dae2f1 Find imports dir in Qt 4.7
2010-10-12 11:08:51 -04:00
Philip Lowman b867a3f1a8 Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
There is no need to introduce this extra variable as FindBoost
can simply rely on if Boost_USE_STATIC_RUNTIME is defined
or not to disable the old searching behavior for static runtime
libraries on WIN32.
2010-10-11 22:48:33 -04:00
Brad King 3445532652 FindHDF5: Fix typo in parallel-IO support check (#11291) 2010-10-11 09:35:46 -04:00
David Partyka 35d2770df9 Update module to locate newely released MS MPI HPC Pack R2. 2010-10-11 09:20:07 -04:00
Clinton Stimpson 2dae2f1a0b Find imports dir in Qt 4.7 2010-10-08 20:55:55 -06:00
Rolf Eike Beer d2f8c5f8ab FindSubversion: Use C locale to detect version (#11273)
Force LC_ALL to C before the call of the svn executable as it is done in
the Subversion_WC_INFO macro a few lines below.
2010-10-07 11:10:40 -04:00
Rolf Eike Beer 42126aaf6c FindSubversion: Fix for German localized client (#11273)
On a Win32 system with a German version of SilkSVN I couldn't run CMake
again on the working copy as the cache is displayed as corrupted. The
cause is that the regular expression to find the version number will not
match and put everything from the "svn --version" output into the cache,
which contains umlauts and other funny characters.

Fix the regexp to not only match " version " but also " Version " as
it's in the German output. I have no idea what will happen on a French
or Japanese system. This should be easy to test as it happens also on a
German Linux system.
2010-10-07 10:04:19 -04:00
Brad King ba3064b584 Merge topic 'FindCUDA-allow-g3'
6916f8d Allow -g3 for CUDA v3.0+.
2010-10-05 15:33:12 -04:00
Brad King 100f2ad278 Merge topic 'Fix-0011263-CUDA_SDK_PATH'
1df8516 Fix for bug 0011263.
2010-10-05 15:32:58 -04:00
Brad King f7c58fe5f3 Merge topic 'CPackHandleParenthesisInSystemName'
4a4a53f CPackRPM  Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
2010-10-05 15:32:13 -04:00
Brad King cb314e250b Merge topic '11279'
aca758b Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
2010-10-05 15:30:32 -04:00
Brad King b38297d2d1 Merge topic 'vs-load-Windows-ifort'
20f4973 Reset platform/compiler info status for each language
2010-10-05 15:21:25 -04:00
James Bigler 6916f8dba7 Allow -g3 for CUDA v3.0+.
In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause
compilation errors.  This was fixed in version 3.0.
2010-10-04 16:42:21 -06:00
James Bigler 1df8516c0e Fix for bug 0011263.
Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
2010-10-04 16:11:08 -06:00
Eric NOULARD 4a4a53f3dd CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
merge patch from Frank Stappers
2010-10-03 23:29:34 +02:00
Philip Lowman aca758bf29 Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
Thanks to Aaron C. Meadows for the patch.
2010-09-30 21:24:28 -04: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
Brad King dbf7664c99 Merge topic 'PutRequiredVersionInDetailMessageInFPHSA'
567ac0b Also store the required version number in the details message.
2010-09-28 14:05:15 -04:00
Brad King e66c12a265 Merge topic 'python_module_prefix_suffix'
d36c16a Set the module prefix, updated Windows suffix.
2010-09-28 14:04:24 -04:00
Brad King c86d677fe0 Merge topic 'findqt4-cross-compile'
25931ae Fix regression in cross-compile patches with finding Qt libs.
2010-09-28 14:03:37 -04:00
Brad King c0665ca795 Merge topic 'DescriptionsForFeatureSummaryALL'
b935f00 Close ENDFUNCTION() properly with the same name as FUNCTION()
07bca48 Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
d5b2915 APPEND and not-APPEND mode of feature_summary() were swapped
2010-09-28 14:02:19 -04:00
Brad King 20f49730ae Reset platform/compiler info status for each language
In each CMake<lang>Information.cmake file we use an _INCLUDED_FILE
variable to track whether a compiler information file has been loaded.
Reset this variable for each language.

This fixes Fortran under VS generators with the Intel plugin.
Previously the variable would be left set true from C and C++ and then
Fortran would not load old-style files like Platform/Windows-ifort.
2010-09-28 09:49:20 -04:00
Alex Neundorf 79dd9becad We already have 2010, fix copyright year.
Alex
2010-09-27 22:14:39 +02:00
Alex Neundorf 567ac0bb1f Also store the required version number in the details message.
This way the success/failure message of FPHSA() is also printed again
if the required version is changed.

Alex
2010-09-27 22:08:14 +02:00
Alex Neundorf ffeca06a93 Add missing copyright headers
Alex
2010-09-27 18:04:34 +02:00
Alex Neundorf 7b337ac8e2 Improve misleading comments.
(the assembler is not really tested)

Alex
2010-09-25 21:00:52 +02:00
Alex Neundorf e1fc9b902a Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
Alex
2010-09-25 20:57:03 +02:00
David Gobbi d36c16a760 Set the module prefix, updated Windows suffix.
Set the Python module prefix to PYTHON_MODULE_PREFIX, and changed the
suffix on Windows to .pyd as .dll is officially deprecated.
2010-09-24 15:04:24 -04:00
Clinton Stimpson 25931ae10e Fix regression in cross-compile patches with finding Qt libs.
If a Qt installation is in CMAKE_PREFIX_PATH and a
QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
prefer finding libs in the latter Qt installation.
2010-09-23 16:50:09 -06:00
Brad King 8150dc4d2b Merge topic 'fix-11026'
4a323bd Honor MAKECOMMAND value saved in cache (#11026)
2010-09-22 13:53:46 -04:00
Brad King 14d5ea7438 Merge topic 'mingw-long-object-lists'
5f05a3c MinGW: Support long object file lists
2d9bb33 Evaluate <OBJECT_DIR> rule variable for executables
2010-09-22 13:52:24 -04:00
Brad King a60241913c Merge topic 'cygwin-system-processor'
2412d9b Use 'uname -m' for processor on Cygwin (#10774)
2010-09-22 13:52:10 -04:00
Brad King 89884a26fd Merge topic 'find-fltk-cygwin'
a6628d1 FindFLTK*: Use Cygwin fltk on Cygwin
2010-09-22 13:52:01 -04:00
David Cole 4a323bde0c Honor MAKECOMMAND value saved in cache (#11026)
Use a separate variable to pass to the BUILD_COMMAND call
and then use set(CACHE) to transfer that to MAKECOMMAND.
That way, if MAKECOMMAND is in the cache already, it is
left untouched. Fixes regression introduced in commit
0b38bb4c with the fix for bug #2336.

Thanks to Evgeniy P for the patch.
2010-09-21 21:51:40 -04:00
Yaakov Selkowitz 2412d9bc0e Use 'uname -m' for processor on Cygwin (#10774)
POSIX requires 'uname -m' but not 'uname -p':

  http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html

Indeed Cygwin 'uname -p' returns "unknown".
2010-09-21 17:32:49 -04: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
Brad King 2f665d5d1f FindPythonInterp: Look for python2.7 interpreter
Python 2.7 was released on July 3rd, 2010.
2010-09-21 17:22:07 -04:00
Alex Neundorf b935f00fdf Close ENDFUNCTION() properly with the same name as FUNCTION()
Alex
2010-09-21 22:43:04 +02:00
Alex Neundorf 07bca48868 Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
Alex
2010-09-21 22:31:04 +02:00
Alex Neundorf d5b29155b4 APPEND and not-APPEND mode of feature_summary() were swapped
Alex
2010-09-21 22:27:14 +02:00
Brad King 5970c0f947 Merge topic 'FindBoost_bugfixes'
b8b9a32 FindBoost.cmake: Fix library search path glitch introduced in earlier commit
90c16d8 FindBoost.cmake: Implements 11160
95ff120 FindBoost.cmake: Fixes 10436
5cce138 FindBoost.cmake: Fixes 11121
0239041 FindBoost.cmake: Fixes 11246
d4900c2 FindBoost.cmake: Fix compiling against a boost source tree
6ed7d99 FindBoost.cmake: Add Boost_NO_SYSTEM_PATHS option
16b0eb5 FindBoost.cmake: Miscellaneous changes and refactoring
5e6f0f0 FindBoost.cmake fixes for issues 11204 & 8529
2010-09-21 10:53:57 -04:00
Brad King b7539e3832 Merge topic 'compaq-fortran-moddir-flag'
c04af06 Add module-dir flag for Compaq Visual Fortran (#11248)
2010-09-21 10:41:02 -04:00
Brad King 8c865b3b25 Merge topic 'FindMPI-f-flags'
a56969f FindMPI: Recoginze -f flags from mpicc (#10771)
2010-09-21 10:40:39 -04:00
Brad King a8d0539598 Merge topic '11249_FindFLEX'
38691d9 FindFLEX.cmake: Fix issue 11249
2010-09-21 10:39:33 -04:00
Brad King c04af06009 Add module-dir flag for Compaq Visual Fortran (#11248)
This compiler uses "-module:" to specify where modules should be placed.
2010-09-20 09:53:45 -04:00
Brad King a56969f3d3 FindMPI: Recoginze -f flags from mpicc (#10771)
Parse compiler flags like "-fmessage-length=0 -fstack-protector
-funwind-tables -fasynchronous-unwind-tables -fno-strict-aliasing" from
the output of "mpicc -show".  We already handle preprocessor definition
arguments like -DUSE_STDARG.  Honor '-f' flags too.
2010-09-20 09:08:08 -04:00
Philip Lowman 38691d91a5 FindFLEX.cmake: Fix issue 11249
FindFLEX no longer sense a CMake fatal error if executing "flex --version" fails
unless the REQUIRED argument was specified.
2010-09-19 23:56:34 -04:00
Philip Lowman b8b9a32170 FindBoost.cmake: Fix library search path glitch introduced in earlier commit 2010-09-19 23:15:07 -04:00
Philip Lowman 7016fae6d4 Fix 11136: [patch] FindThreads.cmake documents the wrong variable
Fixed documentation to be correct.
2010-09-18 13:46:08 -04:00
Philip Lowman 90c16d84be FindBoost.cmake: Implements 11160
Add Boost_REALPATH option for people packaging Boost with their app:

Boost_REALPATH               Resolves symbolic links for discovered boost libraries
                             to assist with packaging.  For example, instead of
                             Boost_SYSTEM_LIBRARY_RELEASE being resolved to
                             "/usr/lib/libboost_system.so" it would be
                             "/usr/lib/libboost_system.so.1.42.0" instead.
                             This does not affect linking and should not be
                             enabled unless the user needs this information.
2010-09-18 11:57:42 -04:00
Philip Lowman 95ff12091d FindBoost.cmake: Fixes 10436
Add an additional library filename permutation which fixes
library detection for some custom builds of Boost.
2010-09-18 11:21:23 -04:00
Philip Lowman 5cce138c91 FindBoost.cmake: Fixes 11121
Add support for finding Boost.Thread with special THREADAPI in filename
2010-09-18 11:19:29 -04:00
Philip Lowman 02390416e1 FindBoost.cmake: Fixes 11246
FindBoost can find shared libraries (.so) in rare circumstances
even when Boost_USE_STATIC_LIBS is set
2010-09-18 11:16:09 -04:00
Philip Lowman d4900c2eca FindBoost.cmake: Fix compiling against a boost source tree
This fixes issues 11192 & 11187.
2010-09-18 10:59:42 -04:00
Philip Lowman 6ed7d9937a FindBoost.cmake: Add Boost_NO_SYSTEM_PATHS option
This fixes several duplicate issues in the tracker (7725, 11019, 8412)
2010-09-18 10:56:15 -04:00
Philip Lowman 16b0eb5ac5 FindBoost.cmake: Miscellaneous changes and refactoring
* Add a warning if the user sets Boost_ROOT which is not correct
* Clarify directions to the user for viewing debugging messages
* Move the CMAKE_FIND_LIBRARY_SUFFIXES tweak outside of a for loop
2010-09-18 10:41:53 -04:00
Philip Lowman 5e6f0f0d73 FindBoost.cmake fixes for issues 11204 & 8529
* Fixed issue 11204: FindBoost.cmake had trouble discovering libraries
  when both -sgd and -gd libraries were available by adding a new option
  Boost_USE_STATIC_RUNTIME.
  Backwards compatibility of searching for first -gd and then -sgd on
  WIN32 is maintained unless the user sets Boost_COMPAT_STATIC_RUNTIME to
  false (or they have set Boost_USE_STATIC_RUNTIME).
* Fixed issue 8529: FindBoost was unable to detect boost libraries compiled against
  STLport, by reworking the way the Boost ABI tag is calculated.  There are additional
  ABI tag options available now as well.
* Boost_DEBUG now reports the full list of filenames being searched for when
  find_library is called.
2010-09-18 10:24:30 -04:00
Brad King 5f05a3c25e MinGW: Support long object file lists
Use a combination of response files and the archiver to support long
object file lists that do not fit in the Windows command-line length
limit.  This can work only with GCC >= 4 because the MinGW GCC 3.x
front-ends do not support response-file syntax.
2010-09-17 09:25:36 -04:00
Brad King ee66f21271 Merge topic 'issue_10199'
80bad29 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT
2010-09-14 13:28:07 -04:00
Brad King f2a813d51c Merge topic 'CUDAv3.2PathChanges'
4f0636e Added CUDA 3.2 directory changes.  Disable emulation mode for CUDA 3.1+.
2010-09-14 13:19:10 -04:00
Marcel Loose 80bad29af6 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT 2010-09-13 13:13:12 +02:00
James Bigler 4f0636e979 Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.
CUDA 3.2 on Windows systems changed the layout of the library paths.  This adds the extra
directories needed to locate the new files.

I also explicitly disable emulation mode for CUDA 3.1+.  This feature was deprecated in
3.0 and ultimately removed in 3.1.  The script errors out if CUDA_BUILD_EMULATION is
turned on.  I didn't want to ignore emulation mode (even with a warning - which most
people may not even see) and have users confused as to why it wasn't working.
2010-09-10 11:48:38 -06:00
David Cole 2f98dac486 Correct CMAKE_INSTALL_PREFIX value for Win64 apps (#9992)
The default value for CMAKE_INSTALL_PREFIX should be
based on what architecture the built targets are, not
what architecture CMake itself is.

This fix merely guesses better what the built targets
architecture is. It still may guess incorrectly in some
cases. For those cases, it will have to be up to build
scripts and developers on projects to pass in a correct
value for CMAKE_INSTALL_PREFIX with -D on the command line
or via 'force cache value' logic in CMakeLists.txt files.
2010-09-09 08:32:42 -04:00
Brad King f444b9555f Merge topic 'allow_upper_case_cpp_and_others'
7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.
ba0a890 Only test for .CPP on Microsoft compilers which will handle .CPP as c++.
d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.
ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
2010-09-08 11:36:46 -04:00
Brad King 661d5166b0 Merge topic 'FindwxWidgets-fixes'
ede24f8 ENH #8993: FindwxWidgets add support for wx-config custom options.
3dbeeb7 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.
f46712e BUG #11123: Generic include dir should come after config specific one.
6cb14eb STYLE: Clarified/Fixed documentation of UsewxWidgets.
36c15a2 BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
2010-09-08 11:08:55 -04:00
Brad King 18c71e3c79 Merge topic 'fix-10417'
e93a4b4 Avoid adding self as prerequisite. (#10417)
2010-09-08 11:08:22 -04:00
Brad King 795676062e Merge topic 'fix-9284'
88fed66 Make bundle items writable before fixup (#9284)
2010-09-08 11:08:16 -04:00
Brad King 048c905f05 Merge topic 'hpux-required-runtime-path-10571'
11a917d HP-UX: Always add /usr/lib to rpath (#10571)
2010-09-08 11:08:13 -04:00
Brad King dd0b68a214 Merge topic '11186'
c167595 Merge patch for detecting gdk-pixbuf library
2010-09-08 11:08:09 -04:00
Brad King 28edb70a9e Merge topic 'vs-project-groups'
e6ac0aa Add FOLDER target property, for IDEs (#3796)
2010-09-08 11:08:05 -04:00
Brad King 02e3f42a6a Merge topic 'watcom_fixes'
3b7da53 Fix for bug 10388, fix various default flags.
2010-09-08 11:08:01 -04:00
Brad King 2079424568 Merge topic 'find-macports'
eae45a6 Search MacPorts /opt/local prefix on Mac
2010-09-08 11:07:59 -04:00
Brad King 4ea441eaf9 Merge topic 'ImproveFindPackageConfigMode'
5cdfc9c Improve wording of the error message of find_package() in config-mode
4969c3b Improve version notice in the generated message
e8ae504 Add option CONFIG_MODE to FPHSA()
b4b8f96 Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONS
cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake
0367245 Replace the two vector<string,string> with one vector<struct{string,string}>
130b0e2 Improve error message in Config-mode when no appropriate version was found
dfe9c95 Record all considered Config files and their versions.
2010-09-08 11:07:55 -04:00
Mike McQuaid 88fed668b1 Make bundle items writable before fixup (#9284)
This ensures that any bundle items are made user writable before
any attempt is made to alter them using install_name_tool. This is
because MacPorts/Fink/Homebrew don't install libraries as writable.
This fix is needed to allow fixup_bundle_item to work correctly
when ingesting libraries installed by these package managers.
2010-09-07 22:49:32 -04:00
David Cole e93a4b4d34 Avoid adding self as prerequisite. (#10417)
Thanks to Clinton Stimpson for the patch.
2010-09-07 21:29:43 -04:00
Brad King 11a917d04e HP-UX: Always add /usr/lib to rpath (#10571)
Set CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH in the HP-UX platform file to
tell CMake to pass -Wl,+b,/usr/lib no matter whether RPATH is enabled or
not.  This corrects the behavior of -Wl,+nodefaultrpath to look in this
default library path as documented.
2010-09-07 08:44:19 -04:00
Miguel A. Figueroa-Villanueva ede24f8171 ENH #8993: FindwxWidgets add support for wx-config custom options.
Added suport for setting a custom toolkit, refix, etc. when using
wx-config.
2010-09-05 09:39:37 -04:00
Philip Lowman c1675951a0 Merge patch for detecting gdk-pixbuf library
The gdk-pixbuf library was split off from core GTK in 2.21 so it could be used
separately by people outside GTK.  Now FindGTK searches and adds it to the
library/include list.  Thanks to Vincent Untz for the patch and Ricardo Cruz
for the heads up.
2010-09-03 22:05:09 -04:00
David Cole e6ac0aacf6 Add FOLDER target property, for IDEs (#3796)
This work was started from a patch by Thomas Schiffer.
Thanks, Thomas!

See the newly added documentation of the FOLDER target
property for details.

Also added global properties, USE_FOLDERS and
PREDEFINED_TARGETS_FOLDER. See new docs here, too.

By default, the FOLDER target property is used to organize
targets into folders in IDEs that have support for such
organization.

This commit adds "solution folder" support to the Visual
Studio generators. Currently works with versions 7 through
10.

Also, use the new FOLDER property in the ExternalProject
test and in the CMake project itself.
2010-09-03 13:53:22 -04:00
Bill Hoffman d26cd46989 Only use .CPP .CXX and .C++ do not work by default with g+++. 2010-09-02 18:02:57 -04:00
Bill Hoffman 3b7da5396d Fix for bug 10388, fix various default flags. 2010-09-02 14:35:17 -04:00
Bill Hoffman ced61f5722 Let CMake recognize .CPP .CXX and .C++ as c++ files. 2010-09-02 11:56:40 -04:00
Miguel A. Figueroa-Villanueva 3dbeeb7793 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.
Also fixed usage sample in comments, which can be misleading for MinGW
users as demonstrated by mantis issue #10089.
2010-09-01 12:27:31 -04:00
Miguel A. Figueroa-Villanueva f46712ebe7 BUG #11123: Generic include dir should come after config specific one. 2010-09-01 10:40:01 -04:00
Miguel A. Figueroa-Villanueva 6cb14ebf16 STYLE: Clarified/Fixed documentation of UsewxWidgets. 2010-09-01 09:34:57 -04:00
Brad King eae45a67e7 Search MacPorts /opt/local prefix on Mac
Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used
for all find* commands.  Previously only find_library and find_path
would look under /opt/local/lib and /opt/local/include, respectively.
2010-09-01 08:50:51 -04:00
Brad King 8e76221754 Merge topic 'FindGTK2_10688'
7828932 10688: FindGTK2.cmake doesn't auto-detect macports
2010-09-01 08:42:18 -04:00
Miguel A. Figueroa-Villanueva 36c15a2f0b BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
The wxWidgets_USE_FILE variable to be used with the include command
should be set to UsewxWidgets; not UsewxWidgets.cmake.
2010-09-01 00:15:07 -04:00
Brad King f628cac5b0 Merge topic 'FindwxWidgets-fixed-bug-9775'
f51eb9c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.
6bbf2a0 ENH: #9775 Added support for new wxWidgets 2.9 libraries.
2010-08-31 14:53:57 -04:00
Brad King 39da06e8fa Merge topic 'FindPackageLogVersion'
88e6447 Add macro ADD_FEATURE_INFO() and improve docs.
b353524 Improve wording of the documentation.
6fc88b2 Improve documentation.
3333878 Log the required package version and major improvement to FeatureSummary
2010-08-31 14:35:46 -04:00
Brad King b3f878d013 Merge topic 'fix-10747'
90add6b Refine formatting for cmake --help-module output.
af0c719 Merge branch 'patches/docBundleUtilities'
51cc861 Improve documentation of GetPrerequisites.cmake
f811470 Improve documentation of BundleUtilities.cmake
2010-08-31 14:25:20 -04:00
Brad King f95074ba70 Merge topic 'CPack-FixDESTDIR-Issue7000'
3178767 Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake
6a521f8 CPack   Enable better handling of absolute installed files
40dc97d CPack   Backward-compatibly enforce DESTDIR for DEB and RPM
2010-08-31 14:22:59 -04:00
Brad King 2391002d86 Merge topic 'moc_param_bug11120'
2756311 Make sure moc parameters file goes in binary directory.
2010-08-31 14:19:59 -04:00
Brad King 7e3f04e7e9 Merge topic 'FindBison_10241'
a53b47a 10241: FindBISON.cmake clears wrong variable
2010-08-31 14:19:14 -04:00
Brad King 4262c29d14 Merge topic 'FindCxxTest_11041'
ed78a72 11041: Improve FindCxxTest to use Python or Perl automatically; custom flags
2010-08-31 14:19:02 -04:00
Miguel A. Figueroa-Villanueva f51eb9cb0c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.
Forgot to add new libraries in list of libs to be cleared.
2010-08-30 19:38:45 -04:00
Alex Neundorf 4969c3b5bb Improve version notice in the generated message
Now the version number is also printed if no required version was
specified, but a version number was detected (showing more information
shouldn't hurt).
The code for generating the failure message in config-mode is moved
into a separate helper macro, it was becoming too much.

Alex
2010-08-30 22:42:58 +02:00
Alex Neundorf e8ae504c0e Add option CONFIG_MODE to FPHSA()
When this option is used for FPHSA(), it automatically handles the
information created by a preceding find_package(NO_MODULE) all and
creates a proper success/error message.

Alex
2010-08-29 19:53:43 +02:00
Alex Neundorf cc955a042b Small cleanup of FindPackageHandleStandardArgs.cmake
-remove unnecessary arguments _VAR1
-move code for deciding the type of the message into helper macro
 _FPHSA_FAILURE_MESSAGE()

Alex
2010-08-29 18:55:25 +02:00
Miguel A. Figueroa-Villanueva 6bbf2a0e8e ENH: #9775 Added support for new wxWidgets 2.9 libraries.
Added support for new libraries in wxWidgets 2.9 that are
part of the main distribution. These are: wxPropertyGrid,
wxSTC, wxScintilla, and wxRibbon.
2010-08-29 12:22:18 -04:00
Alex Neundorf 88e6447e19 Add macro ADD_FEATURE_INFO() and improve docs.
ADD_FEATURE_INFO() can be used to set the info for a feature,
e.g. an option().
set_feature_info() has been renamed to set_package_info(), since this is
about found or not found packages. For compatiblity set_feature_info()
is still provided.

Alex
2010-08-25 21:53:16 +02:00
David Cole 90add6b504 Refine formatting for cmake --help-module output.
Also refer to self as module, not script.
2010-08-25 14:58:31 -04:00
David Cole af0c719b9a Merge branch 'patches/docBundleUtilities'
of http://github.com/themiwi/CMake
into fix-10747

Conflicts:
	Modules/BundleUtilities.cmake

There was one newly added function in BundleUtilities.cmake
which also needed the same "documentation at top" treatment.
2010-08-25 14:54:14 -04:00
Alex Neundorf b35352464c Improve wording of the documentation.
Alex
2010-08-24 23:08:41 +02:00
Alex Neundorf 6fc88b26b6 Improve documentation.
Alex
2010-08-24 22:59:01 +02:00
Eric NOULARD 3178767d5f Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake 2010-08-24 21:59:13 +02:00
Alex Neundorf 33338781db Log the required package version and major improvement to FeatureSummary
find_package() now also stores the required version automatically, so it
can be used by FeatureSummary.cmake.
This was one of the requested features for setting up nightly builds
for KDE, since with this functionality it will be possible to write
a file at the end of each project which lists all required packages
and their versions. This file could then be compared for equality
with an older one and if something has changed the build maintainer
can be emailed.

In FeatureSummary.cmake there is now a new function feature_summary(),
which also allows to print the log to a file or into a variable.
It also allows to specify whether to append to a file or to write a new
one, and what information to log.

Docs are still missing.

Alex
2010-08-24 21:24:54 +02:00
Brad King d5e3e04a23 Merge topic 'add-ExternalProject-targets'
ef9dd49 Add STEP_TARGETS to ExternalProject module.
2010-08-24 14:46:06 -04:00
Brad King 612c0b68a0 Merge topic 'FixEclipseIncludePathParsingWithSpaces'
9fd4e18 Fix parsing of builtin macros so Eclipse handles them properly (#10868)
2010-08-24 14:42:07 -04:00
Clinton Stimpson 2756311a9a Make sure moc parameters file goes in binary directory.
Fix bug 11120.  Parameters files previously went into source
directory when qt4_generate_moc() was given relative paths.
Also simplified some logic for absolute paths.
2010-08-24 12:41:14 -06:00
David Cole ef9dd49d3d Add STEP_TARGETS to ExternalProject module.
This commit introduces the ability to add custom targets
that correspond to individual ExternalProject steps.
The main motivation behind this new feature is to drive
sub-project based dashboard steps as external projects
with separate targets for update, configure, build and
test output. This makes it easy to construct a ctest -S
script to drive such a dashboard.

With no STEP_TARGETS defined, there are no additional
custom targets introduced, to minimize the chatter in
the target name space. Clients may define STEP_TARGETS
on a per-ExternalProject_Add basis, or at the directory
level by setting the EP_STEP_TARGETS directory property.
2010-08-23 17:50:58 -04:00
Alex Neundorf 9fd4e1814b Fix parsing of builtin macros so Eclipse handles them properly (#10868)
Alex
2010-08-23 20:54:35 +02:00
Eric NOULARD 6a521f8604 CPack Enable better handling of absolute installed files
The idea of the patch is to let the install generator define
CPACK_ABSOLUTE_INSTALL_FILES then when CMake is installing
project he will concatenate the list of files and give
it to specific CPack Generator by defining CPACK_ABSOLUTE_INSTALL_FILES
to be the list of ALL files that were installed using absolute destination.
An example of use has been applied to RPM generator which now
tries to automatically build a relocatable package.
2010-08-23 17:38:33 +02:00
Philip Lowman 78289320dd 10688: FindGTK2.cmake doesn't auto-detect macports 2010-08-19 22:05:05 -04:00
Philip Lowman a53b47a77c 10241: FindBISON.cmake clears wrong variable 2010-08-19 21:50:31 -04:00
Philip Lowman ed78a72a9b 11041: Improve FindCxxTest to use Python or Perl automatically; custom flags
Included patch by Simone Rossetto to check if either Python or Perl
are present in the system.  Whichever intepreter that is detected
is now used to run the test generator program.  If both interpreters
are detected, the CXXTEST_USE_PYTHON variable is obeyed.

Also added support for CXXTEST_TESTGEN_ARGS, for manually specifying
options to the CxxTest code generator.
2010-08-19 21:44:44 -04:00
Brad King 0ea9d650f7 Merge topic 'msvc-version'
76ed7f0 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944)
2010-08-19 13:26:59 -04:00
Brad King 0596f0ce78 Merge topic 'FortranCInterface-doc-typo'
e872f5d FortranCInterface: Fix doc typo FC.h -> FCMangle.h
2010-08-19 13:26:45 -04:00
Brad King 8ccfc5e24d Merge topic 'TimeoutForExecuteProcessInVendorChecking'
e6c9bc2 Add timeout to execute_process() in CMAKE_DETERMINE_COMPILER_ID().
2010-08-19 13:26:07 -04:00
Brad King 9487612590 Merge topic 'CMakeParseArguments'
c327cbd Modules: Fix CMakeParseArguments copyright notice
9eb6cc1 Merge branch 'module-notices' into CMakeParseArguments
b173b87 Add macro CMakeParseArguments() and use it in FPHSA()
2010-08-19 13:23:02 -04:00
Rolf Eike Beer 76ed7f0556 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944) 2010-08-17 18:02:30 -04:00
Brad King e872f5d70a FortranCInterface: Fix doc typo FC.h -> FCMangle.h 2010-08-17 16:43:20 -04:00
Alex Neundorf e6c9bc267b Add timeout to execute_process() in CMAKE_DETERMINE_COMPILER_ID().
In CMAKE_DETERMINE_COMPILER_ID_VENDOR() the compiler is called with various
arguments. In some cases, this can make the compiler hang and wait
forever for input (e.g. "as -v"). That's why add an timeout
so it terminates finally. 10 seconds should be more than enough,
this is the time it takes to startup the compiler, which is
usually quite fast.

Alex
2010-08-17 21:40:45 +02:00
Brad King 30f676c75f Merge topic 'ImproveAsmCompilerIDDetection'
b333779 Detect a COMPILER_ID also for ASM.
691fc2b Remove trailing spaces
2010-08-17 15:19:49 -04:00
Brad King 9e9d23fe0f Merge topic 'FixEclipseIncludePathParsingWithSpaces'
cac6edc Fix EclipseCDT parsing of builtin macros with spaces (#10868)
8102dc3 Fix EclipseCDT include path parsing with spaces (#10868)
2010-08-17 15:17:29 -04:00
Brad King 8f4cc1eb2b Merge topic 'FixZLIBVersion'
75e7278 Fix ZLIB version parsing if no TWEAK version exists
2010-08-17 15:16:47 -04:00
Brad King a890f6a00b Merge topic 'FixSubversionDoc'
3e126e4 Change documentation of Subversion_FOUND and SUBVERSION_FOUND.
2010-08-17 15:16:01 -04:00
Brad King 79383cfd97 Merge topic 'fix-issue-11035'
d570ee7 Fix 11035 : debug/release library configuration mistake
2010-08-17 15:15:30 -04:00
Brad King 69252437ef Merge topic 'python_add_module_scope'
42fd9a5 Bug with default library type of Python modules.
2010-08-17 15:15:04 -04:00
Brad King da6fc97f19 Merge topic 'tg/BlueGeneP'
7083c81 Add platform files for BlueGene/P systems
2010-08-17 15:14:07 -04:00
Brad King 57c5bf5b18 Merge topic 'FindGTK2_fixes'
f6ca76f Several fixes needed to improve Windows support
74a12f3 Add detection for new pangommconfig.h header file
2010-08-17 15:10:48 -04:00
Brad King 164a8568f1 Merge topic 'improve-cpack-docs'
cf4a50b Add documentation for CPACK_PROJECT_CONFIG_FILE.
2010-08-17 15:10:05 -04:00
Brad King 4d8f0c2974 Merge topic 'FindBoost_cygwin_fix'
8de0d1a Fixes problem finding libraries under Boost (#9510)
2010-08-17 15:09:45 -04:00
Brad King 32ebe21ad8 Merge topic 'intel-response-files'
4b1e5f0 Pass objects to Intel linker using a response file
2010-08-17 15:09:12 -04:00
Brad King c327cbdfef Modules: Fix CMakeParseArguments copyright notice
Fix format of the copyright notice to pass the ModuleNoticesTest.
2010-08-17 09:44:30 -04:00
Alex Neundorf b333779e34 Detect a COMPILER_ID also for ASM.
For assembler, the "compiler ID" cannot be detected by "compiling" a
source file, since there is not source file all assemblers understand.
Instead the function CMAKE_DETERMINE_COMPILER_ID_VENDOR() is used to
run the assembler and check its output.
For this the CMAKE_DETERMINE_COMPILER_ID_VENDOR() function had to be
extended so that it creates the run directory if it doesn't exist yet.

In CMakeASMInformation.cmake now also CMAKE_ASM_COMPILER_ID is used
(but there are no such files yet, will come with the support for the
IAR toolchain).

Alex
2010-08-15 16:36:38 +02:00
Alex Neundorf 691fc2baa8 Remove trailing spaces
Alex
2010-08-15 16:08:54 +02:00
Alex Neundorf cac6edcad9 Fix EclipseCDT parsing of builtin macros with spaces (#10868)
Patch from dnewmarch

Alex
2010-08-15 15:15:12 +02:00
Alex Neundorf 8102dc32a3 Fix EclipseCDT include path parsing with spaces (#10868)
Alex
2010-08-15 14:59:16 +02:00
Alex Neundorf 75e727855a Fix ZLIB version parsing if no TWEAK version exists
ZLIB_VERSION_STRING was "1.2.3.#define ZLIB_VERSION "1.2.3"" here, because
the result of the matching for the tweak version was also appended if there
was no TWEAK version and the regexp failed, which gives as result not
an empty string, but the full string.
Now it is only appended if the regexp matches.

Alex
2010-08-14 22:16:06 +02:00
Alex Neundorf b173b879f8 Add macro CMakeParseArguments() and use it in FPHSA()
This adds a macro cmake_parse_arguments() (as discussed on cmake-devel)
which can be used in macros or functions to help with parsing its
arguments. Detailled docs are included.
find_package_handle_standard_args() is the first user of this new macro.

Alex
2010-08-14 22:06:49 +02:00
Alex Neundorf 3e126e45bc Change documentation of Subversion_FOUND and SUBVERSION_FOUND.
As discussed on cmake-devel, here Subversion_FOUND is the recommended one.

Alex
2010-08-14 21:25:22 +02:00
Mathieu Malaterre d570ee7b5a Fix 11035 : debug/release library configuration mistake
Thanks to Dimitri Kaparis for report
2010-08-14 13:18:31 +02:00
Marcus D. Hanwell 42fd9a596f Bug with default library type of Python modules.
The _TARGET_SUPPORTS_SHARED_LIBS variable was being altered outside of
the find module, moving it into the function fixes any of these scoping
issues. Fix tested and verified in VTK and Titan.
2010-08-13 14:49:29 -04:00
Todd Gamblin 7083c81db7 Add platform files for BlueGene/P systems
BlueGeneP-base:    Internal base shared by static and dynamic files
BlueGeneP-static:  Platform file for all-static builds
BlueGeneP-dynamic: Platform file for "default" dynamic builds
2010-08-13 12:17:57 -04:00