kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,692 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

2739 Commits

Author SHA1 Message Date
David Cole 22c138646a Merge topic 'pgi-mac' 
eda7841 Pass Mac linker flag through PGI compiler using "-Wl,"
 2010-11-23 16:12:18 -05:00
David Cole f04bc9fe93 Merge topic '11384' 
0263d8d 11384: FindCxxTest now includes test code in VS project
 2010-11-23 16:11:50 -05:00
David Cole c985676a96 Merge topic '11430' 
a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
 2010-11-23 16:11:46 -05:00
David Cole fcea494787 Merge topic 'IncludeCMakeDetermineCompilerIdInDetermineASMCompiler' 
e3dfbf6 Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
 2010-11-23 16:11:40 -05:00
David Cole 584612595d Merge topic 'spelling' 
8f1798c Modules: Fix spelling 'becase' -> 'because'.
 2010-11-23 16:11:37 -05:00
David Cole 525b528625 Merge topic 'CPackRPM-ComponentSupport' 
66e86b4 CPack  fix kwstyle breakage and make CPackRPM backward compatible
2c84d16 CPackRPM  add basic component support to CPackRPM
 2010-11-23 16:11:33 -05:00
David Cole fa882bb570 Merge topic 'AddASM_NASMSupport' 
e0b6016 Some more fixes for nasm support, from Etienne (#10069)
d25c2eb Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS
e614e9b Add support for yasm, a nasm compatible assembler
79dd9be We already have 2010, fix copyright year.
ffeca06 Add missing copyright headers
7b337ac Improve misleading comments.
e1fc9b9 Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
 2010-11-23 16:11:22 -05:00
David Cole 88281035bd Merge topic 'moc-includes-regex' 
35b91ac Fix regex for moc includes when looking for frameworks.
 2010-11-23 16:11:15 -05:00
Brad King 38b0a84eea Modernize FindITK module (#11494) 
Use the Config mode of find_package to search for ITKConfig.  This makes
FindITK a thin-wrapper around a standard find_package, bringing benefits
like searching lib64 paths when appropriate.  This does for FindITK what
commit 2c1a01dc (Modernize FindVTK module, 2009-10-07) did for FindVTK.
 2010-11-22 13:52:58 -05:00
Brad King eda7841fd2 Pass Mac linker flag through PGI compiler using "-Wl," 
The Mac linker defines -headerpad_max_install_names and the GCC
front-end passes this flag through.  The PGI compiler does not know
about this flag, so we must use -Wl,-headerpad_max_install_names to pass
it to the linker instead.
 2010-11-22 08:43:13 -05:00
Philip Lowman 0263d8dffe 11384: FindCxxTest now includes test code in VS project 
The test code header files are now included in the test target so they
will show up under "Header Files" in Visual Studio targets, for example.
 2010-11-18 23:31:14 -05:00
Philip Lowman a44a05cd9d 11430: FindBullet doesn't find header files installed by Bullet >= 2.77 2010-11-18 22:24:21 -05:00
Alex Neundorf e3dfbf62fc Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467) 
CMakeDetermineASMCompiler.cmake relied on that somebody else (usually
during enabling C or CXX) already included that file, and broke if that
was not the case.
Thanks to Louis for the patch

Alex
 2010-11-17 23:01:36 +01:00
Andrius Štikonas 8f1798c14a Modules: Fix spelling 'becase' -> 'because'. 2010-11-17 11:12:48 -05:00
David Cole 164b11deb7 Merge topic 'EP-extra-generator' 
74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
 2010-11-16 14:46:46 -05:00
David Cole c172ffef06 Merge topic 'cray-compiler' 
53e76c8 Teach CMake about Cray C, C++, and Fortran compilers
34e1ac2 Create Fortran info variables for .mod behavior
 2010-11-16 14:46:30 -05:00
David Cole caf680c4d7 Merge topic 'FixFindQt3REQUIRED' 
a39ee97 Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
 2010-11-16 14:46:04 -05:00
Eric NOULARD 2c84d169b3 CPackRPM add basic component support to CPackRPM 
basic means 1 RPM per component and no dependency handling
this implies some CPackGenerator refactoring
 2010-11-13 17:56:36 +01:00
Marcus D. Hanwell 74e49aa441 BUG 11451 - pass CMAKE_EXTRA_GENERATOR down. 
This patch fixes the behavior of external projects with respect to
generators using the CMAKE_EXTRA_GENERATOR variable.
 2010-11-12 19:43:05 -05:00
Alex Neundorf e0b60166d4 Some more fixes for nasm support, from Etienne (#10069) 
Alex
 2010-11-12 20:27:18 +01:00
Brad King 53e76c8f12 Teach CMake about Cray C, C++, and Fortran compilers 
The Cray Fortran compiler needs "-em" to enable module output and also
"-J." to place the .mod files in the current working directory (instead
of next to the .o file).
 2010-11-12 09:12:08 -05:00
Philip Lowman 1321eb9796 11429: FindGTK2 does not find libraries built for Visual Studio 2010 
Adds support for detecting builds of FindGTK2 with Visual Studio 2010.
Thanks to Vincent Levesque for the patch.
 2010-11-09 21:43:08 -05:00
Alex Neundorf a39ee97c6c Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword 
Alex
 2010-11-09 21:51:59 +01:00
David Cole 0c1261658b Merge topic 'FindPerlLibs-mac' 
20ceccc FindPerlLibs: Fix for Mac locally applied patches
 2010-11-09 15:44:47 -05:00
David Cole b5f9be1d03 Merge topic 'CheckCompilerFlag-foreign-MSVC' 
79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)
 2010-11-09 15:37:33 -05:00
David Cole 9692d5a2b6 Merge topic '11363' 
fffe1c0 11363: FindBoost.cmake fails to find debug libraries in tagged layout install
 2010-11-09 15:29:11 -05:00
David Cole 384816e4de Merge topic 'FixBisonWithLocale' 
506805c Make FindBISON work properly with non-C locales (#11326)
 2010-11-09 15:28:33 -05:00
David Cole 5965ff5112 Merge topic 'qt4-resources-bug5952' 
de04854 Force cmake to run again when qrc dependency scanning needs to happen.
 2010-11-09 15:27:55 -05:00
David Cole b5a46cab85 Merge topic 'qt4-imports-dir' 
cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
 2010-11-09 15:27:23 -05:00
Dave Abrahams 20ceccc4f2 FindPerlLibs: Fix for Mac locally applied patches 
Previously FindPerlLibs did not work with the Mac stock Perl because it
includes patches.  From "perl -V":

  Locally applied patches:
    /Library/Perl/Updates/<version> comes before system perl directories
    installprivlib and installarchlib points to the Updates directory

Adjust paths accordingly.
 2010-11-08 11:09:41 -05:00
Brad King 79e02333a6 BUG: Fix compiler flag test for non-English MSVC (#11336) 
Approach suggested by John Stark.
 2010-11-04 08:50:17 -04:00
Philip Lowman fffe1c07d9 11363: FindBoost.cmake fails to find debug libraries in tagged layout install 2010-10-28 22:51:18 -04:00
David Cole e561a46c1a Merge topic 'getprerequisites-endless-path-appending' 
48e80eb Fixes to GetPrerequisites for cygwin
bee4802 Append the gp_tool path to the system PATH using native slashes.
8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows.
be94c49 Fixed appending PATH to dumpbin tool from growing without bounds.
 2010-10-28 14:11:07 -04:00
David Cole 3f3f3e5f54 Merge topic 'CPackDeb-MoreControl' 
a749724 CPackDeb Added several optional debian binary package fields
 2010-10-28 14:10:23 -04:00
David Cole ec93cd2ead Merge topic 'fix-11173' 
6e1282f ExternalProject: No svn --username if empty (#11173)
 2010-10-28 14:10:01 -04:00
David Cole 5b43d8f8b1 Merge topic 'external-project-extra-gen' 
beeca11 Fixed parallel build for generators with EXTRA.
 2010-10-28 14:09:43 -04:00
David Cole 424ba550e5 Merge topic 'PythonLibs-2.7' 
1f369a7 ENH: Added case for Python 2.7.
 2010-10-28 14:09:17 -04:00
David Partyka 48e80eb724 Fixes to GetPrerequisites for cygwin 
Fix IF(WIN32) guards check for cygwin. Fix checking if the depenency is in a system location to use cygwin style paths on cygwin. Also change GetPrerequisites to switch gp_tool to tools that are very unlikely to be found, ie. dumpbin on Apple and otool on Windows/Unix.
 2010-10-27 17:23:00 -04:00
David Partyka bee4802840 Append the gp_tool path to the system PATH using native slashes. 2010-10-26 11:12:12 -04:00
David Partyka 8e550ba31e Remove unecessary TO_CMAKE_PATH for gp_cmd_dir. 
It is already using CMAKE style paths.
 2010-10-26 10:28:42 -04:00
David Partyka 1684198706 Switch to CMAKE_PATH when doing PATH comparisons on Windows. 
Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches.

Fix indentation.

Fix whitespace
 2010-10-26 10:28:38 -04:00
Eric NOULARD a749724029 CPackDeb Added several optional debian binary package fields 
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
 2010-10-25 20:40:45 +02:00
David Partyka be94c494ed Fixed appending PATH to dumpbin tool from growing without bounds. 
IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
 2010-10-25 13:40:35 -04:00
David Cole 6e1282f840 ExternalProject: No svn --username if empty (#11173) 
Nor --password. But please do if non-empty. Thank you.
 2010-10-22 16:23:27 -04:00
Marcus D. Hanwell beeca11c9b Fixed parallel build for generators with EXTRA. 
Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.
 2010-10-22 11:16:21 -04:00
Alex Neundorf d25c2eb0c0 Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS 
Alex
 2010-10-21 20:57:14 +02:00
Alex Neundorf e614e9b3d7 Add support for yasm, a nasm compatible assembler 
Alex
 2010-10-21 20:51:46 +02:00
David Cole b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR' 
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
 2010-10-19 15:53:16 -04:00
Marcus D. Hanwell 1f369a71c8 ENH: Added case for Python 2.7. 2010-10-19 14:53:33 -04:00
Alex Neundorf 506805c999 Make FindBISON work properly with non-C locales (#11326) 
Applying the patch attached to http://public.kitware.com/Bug/view.php?id=11326
It sets LC_ALL to C before calling execute_process(), so the output is
in english.

Alex
 2010-10-18 21:44:42 +02:00
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