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

2678 Commits

Author SHA1 Message Date
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
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