Commit Graph

16293 Commits

Author SHA1 Message Date
Brad King
c7278633a7 Merge topic 'validate-custom-commands-issue-11963'
339d592 Validate custom command arguments (#11963)
2011-03-15 14:47:51 -04:00
Brad King
3b6dbf7114 Merge topic 'module-link-interface-issue-11945'
c9d55ae Add parens in cmTarget::ComputeLinkInterface logic
c6a8e4c The link interface of MODULE libraries is empty (#11945)
2011-03-15 14:47:42 -04:00
Brad King
9349de14c7 Merge topic 'CPackRPM-TestWithMoreTraces'
ade04de Remove debbuging typo
a201028 CPack try to please SUSE 64 bits and install lib in lib64 and not lib.
7ebbcf1 CPackRPM  non matching ENDIF
0e07b42 CPackRPM even more trace in debug mode or in case of failure
564b731 CPackRPM  add more trace output in order to help failing diagnostics
2011-03-15 14:47:38 -04:00
Brad King
0e4b5caa81 Merge topic 'CPackDeb-ComponentSupport'
bf7066c CPackDeb  add Component Support to DEB generator fix #0011655
2011-03-15 14:47:35 -04:00
Brad King
f8f6c5f899 Merge topic 'qt4-paramfile-speed'
ae587e4 Speed up creation of parameters file for moc custom command.
2011-03-15 14:47:30 -04:00
Brad King
b035e638c0 Merge topic 'qt4-cross-compile-no-default'
46f64bd When cross compiling, don't double-root paths when using find_*.
2011-03-15 14:47:25 -04:00
Brad King
d69220fb48 Merge topic 'MakeUseMangledMesaScriptable'
968d5a0 Make use_mangled_mesa() available in cmake script mode (#11926)
1a91ac4 Remove trailing whitespace
2011-03-15 14:47:22 -04:00
Brad King
dd68c0cb16 Merge topic 'fix-InstallReqdSysLibs-again'
971a735 InstallRequiredSystemLibraries: Read reg values with get_filename_component
2011-03-15 14:47:17 -04:00
Brad King
a4219aa435 Merge topic 'ctest-git-submodule-recursive'
732af7f CTest: Do not fail with submodules and Git < 1.6.5.0
1173cc4 CTest: Update Git submodules with --recursive
2011-03-15 14:47:14 -04:00
KWSys Robot
1500dc6d43 KWSys Nightly Date Stamp 2011-03-15 00:13:04 -04:00
Brad King
339d5922d9 Validate custom command arguments (#11963)
Reject quoted commands immediately with an error message instead of
allowing a later assertion failure.
2011-03-14 17:49:30 -04:00
Eric NOULARD
ade04de7ec Remove debbuging typo 2011-03-14 21:12:26 +01:00
Brad King
c9d55ae5b9 Add parens in cmTarget::ComputeLinkInterface logic
Avoid GCC warning

  warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

added by commit c6a8e4c7 (The link interface of MODULE libraries is
empty, 2011-03-09).
2011-03-14 15:34:26 -04:00
KWSys Robot
5c6a7bdbf2 KWSys Nightly Date Stamp 2011-03-14 00:12:19 -04:00
Eric NOULARD
a201028626 CPack try to please SUSE 64 bits and install lib in lib64 and not lib. 2011-03-13 21:15:49 +01:00
KWSys Robot
e5d85efef1 KWSys Nightly Date Stamp 2011-03-13 00:13:02 -05:00
KWSys Robot
22825b2b06 KWSys Nightly Date Stamp 2011-03-12 00:13:08 -05:00
M. Konrad
bf7066c6ce CPackDeb add Component Support to DEB generator fix #0011655
Contribution by Martin Konrad
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2011-03-11 08:47:15 +01:00
KWSys Robot
8a16bdde05 KWSys Nightly Date Stamp 2011-03-11 00:12:13 -05:00
Clinton Stimpson
ae587e49a6 Speed up creation of parameters file for moc custom command.
Thanks A. Saratow for patch.
2011-03-10 14:45:45 -07:00
Markus Rathgeb
46f64bd9e7 When cross compiling, don't double-root paths when using find_*. 2011-03-10 14:17:13 -07:00
Alex Neundorf
968d5a0ff1 Make use_mangled_mesa() available in cmake script mode (#11926)
There is nothing in it which speaks against this.

Alex
2011-03-10 21:44:02 +01:00
Alex Neundorf
1a91ac4d0d Remove trailing whitespace
Alex
2011-03-10 21:43:02 +01:00
Brad King
732af7fbba CTest: Do not fail with submodules and Git < 1.6.5.0
Several major Linux distributions still do not provide Git >= 1.6.5.0 in
their stable package lists.  Prior to commit 1173cc4a (Update Git
submodules with --recursive, 2011-02-22) CTest was able to use older Git
versions but simply silently failed to update submodules recursively.
Instead of failing with older Git versions preserve the status quo and
add a warning in the update log.  Users testing projects with recursive
submodules may simply update to a Git new enough to support them.
2011-03-10 13:57:30 -05:00
Eric NOULARD
7ebbcf19de CPackRPM non matching ENDIF 2011-03-10 18:32:47 +01:00
Eric NOULARD
0e07b425ca CPackRPM even more trace in debug mode or in case of failure 2011-03-10 18:20:16 +01:00
Eric NOULARD
564b7311f4 CPackRPM add more trace output in order to help failing diagnostics 2011-03-10 09:48:46 +01:00
KWSys Robot
8def3f5949 KWSys Nightly Date Stamp 2011-03-10 00:12:12 -05:00
David Cole
971a735ba2 InstallRequiredSystemLibraries: Read reg values with get_filename_component
64-bit CMake can now find the VC redist folder.

See this thread on the CMake mailing list for the original report:
http://www.cmake.org/pipermail/cmake/2011-March/043342.html

Thanks to J. Decker for the suggested fix.
2011-03-09 18:03:11 -05:00
Brad King
c6a8e4c71a The link interface of MODULE libraries is empty (#11945)
MODULE libraries cannot be linked into other libraries and executables
(just like executables without ENABLE_EXPORTS).  Set the MODULE target
link interface to be empty.  This allows such targets to be installed in
an EXPORT set without including all their private implementation
dependencies.
2011-03-09 09:52:46 -05:00
KWSys Robot
fc3eb139c9 KWSys Nightly Date Stamp 2011-03-09 00:13:04 -05:00
Brad King
036aab093b Merge topic 'ReworkedAsmSupport'
b3ce420 Do not bother enabling C++ in Assembler test
80f6a34 Teach Assembler test to generate main.s at build time
1dafa74 Fix Assembler test to parse C flags string before using
4139a73 -only enable the asm test for the Intel compiler if we are under UNIX
1f6c6b1 -use CMAKE_C_FLAGS when generating the assembler file
d0f71e2 Add ASM platform information for HP compiler on HP
bd580be Merge branch 'hp-compiler-info' into ReworkedAsmSupport
a0bab7a Add ASM platform information for XL compiler on AIX
c03b610 Merge branch 'aix-xl-platform-info' into ReworkedAsmSupport
c623008 Initialize ASM rpath flags for executables with those for shared libs
17c658f Add support for the Intel compiler used for ASM under Windows
4258b24 Add more regex for gcc, always print the ASM compiler ID
9071b8b Add temporary debug output for compiler ID detection for ASM
48f7199 It's ELSEIF(), not ELSIF()
d103c75 Fix bad comparison in the detect assembler-code
20fe0be Only try assembler support for Makefile-based generators
8614470 Use a regexp instead a lot of ORs for checking the compiler ID
cf88092 The Assembler test now tests ASM for GNU, Intel, HP, XL and SunPro
66614a8 Add assemble- and preprocess commands for HP
78f7c59 Fix the default CMAKE_ASM_COMPILE_OBJECT, make XL-ASM use it
7456461 Change the default rules so they fit better to the new ASM handling
5542d58 Set the HP asm file suffix
f745220 Add support for ASm for the HP compiler.
00735d4 Add suport for ASM for the IBM XL compiler
d3e9e8a Add support for ASM for the SunPro compiler
64e66eb Actually use CMAKE_ASM_COMPILER for asm, instead of CMAKE_C_COMPILER
38f92bf Add ASM support for the Intel compiler
4b40d42 Rework the way assembler is handled, use the C/CXX compiler by default
2011-03-08 14:22:38 -05:00
Brad King
831fef8167 Merge topic 'improve-ExternalProject-file-name-recognition'
7f10b13 ExternalProject: Extract file names from more urls
2011-03-08 14:22:35 -05:00
Brad King
ba14c92254 Merge topic 'CPack-MoreRobustComponentFileList'
b813f86 CPack  fix compile error on VS70 and avoid KWStyle warnings
77333a9 CPack  more robust way to collect files belonging to a component
2011-03-08 14:22:32 -05:00
Brad King
5148d0b92d Merge topic 'CPackRPM-enableCPackTests'
dc9965f CPackRPM  do not run test if build dir contains space
e4d4dfc CPackRPM  activate CPackRPM test on Linux systems where rpmbuild is found
2011-03-08 14:22:28 -05:00
Brad King
9c1344f33b Merge topic 'CPackArchive-PackageOrphanComponents'
fe530ff CPackArchive package all components specified in CPACK_COMPONENTS_ALL
2011-03-08 14:22:24 -05:00
Brad King
27b41deaed Merge topic 'link-static'
077954d Test static linking with LINK_SEARCH_START_STATIC
5abfb57 Add target property LINK_SEARCH_START_STATIC to aid static linking
2011-03-08 14:22:20 -05:00
Brad King
b665d2f08a Merge topic 'remove-self-CMAKE_BACKWARDS_COMPATIBILITY-mark'
fa10a67 Remove unused CMAKE_BACKWARDS_COMPATIBILITY mark
2011-03-08 14:22:16 -05:00
Brad King
8a8234df05 Merge topic 'aix-xl-platform-info'
d30dcf1 Move RPATH flags to AIX per-compiler information files
89ea7a3 Factor AIX and XL compiler flags into common module
2011-03-08 14:22:13 -05:00
Brad King
277624ba04 Merge topic 'hp-compiler-info'
5f0a259 Factor HP compiler flags into per-platform/per-compiler files
2011-03-08 14:22:09 -05:00
KWSys Robot
be9af61f72 KWSys Nightly Date Stamp 2011-03-08 00:10:31 -05:00
KWSys Robot
e927777461 KWSys Nightly Date Stamp 2011-03-07 00:12:20 -05:00
KWSys Robot
4586809156 KWSys Nightly Date Stamp 2011-03-06 00:13:02 -05:00
KWSys Robot
278bf6f29a KWSys Nightly Date Stamp 2011-03-05 00:13:04 -05:00
David Cole
7f10b137e1 ExternalProject: Extract file names from more urls
Notably, downloads from sourceforge.net and gitweb snapshots.
2011-03-04 17:09:41 -05:00
Eric NOULARD
b813f863e6 CPack fix compile error on VS70 and avoid KWStyle warnings 2011-03-04 22:57:37 +01:00
Eric NOULARD
dc9965f9a0 CPackRPM do not run test if build dir contains space 2011-03-04 22:17:10 +01:00
Brad King
b3ce4200dc Do not bother enabling C++ in Assembler test
This test needs only the C compiler and ASM compiler so do not enable
the C++ compiler.
2011-03-04 09:17:30 -05:00
Brad King
80f6a344fc Teach Assembler test to generate main.s at build time
Use a custom command to generate the assembly source file at build time.
Also set CMAKE_VERBOSE_MAKEFILE so the test output contains all the
build rules.  These two changes will show the entire .c -> .s -> .o and
final link commands in the test output.
2011-03-04 09:08:18 -05:00
Brad King
1dafa7498f Fix Assembler test to parse C flags string before using
Commit 1f6c6b1c (use CMAKE_C_FLAGS when generating the assembler file,
2011-03-03) added use of CMAKE_C_FLAGS to the assembler generation step.
However, this variable is meant for direct substitution into a shell
command line so we need to parse it to separate the arguments first.
2011-03-04 08:59:56 -05:00