Commit Graph

2519 Commits

Author SHA1 Message Date
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
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
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
Philip Lowman
f6ca76f195 Several fixes needed to improve Windows support
* Add support for detecting fontconfig.h header
* Call find_package(Freetype) since it's required
* Add support for allowing users to add additional library directories
  via the GTK2_ADDITIONAL_SUFFIXES variable (kind of a future-kludge in
  case the GTK developers change versions on any of the directories in the
  future).
* Fixed a problem on Windows where you had to configure twice to find
  the gtk & gdk libraries
2010-08-12 01:45:19 -04:00
Philip Lowman
74a12f3042 Add detection for new pangommconfig.h header file
Thanks to Sune Vuorela & the Debian Project for the patch
http://git.debian.org/?p=collab-maint/cmake.git;a=commitdiff;h=5dc3acd7
2010-08-12 01:38:31 -04:00
David Cole
cf4a50bcdb Add documentation for CPACK_PROJECT_CONFIG_FILE. 2010-08-11 11:40:11 -04:00
Philip Lowman
8de0d1a8ca Fixes problem finding libraries under Boost (#9510) 2010-08-10 22:05:17 -04:00
Brad King
74805b28c1 Merge topic 'ImprovedVersionCheckingInSomeModules'
430336c Merge branch 'findsubversion_fphsa_cleanup'
b6c6156 Use FPHSA() in FindSWIG, including version checking.
656cd2f Improved version checking for FindCUDA using the new mode of FPHSA
126db7b Improved version checking for FindSubversion using the new mode of FPHSA()
77d909b Fix DETAILS string with version number in FHPSA()
19b68b9 Improved version checking for FindJava using the new FPHSA() mode
6bb0b6e Improved version checking for FindRuby using the new mode of FPHSA()
946493f FindSquish doesn't detect the version, remove that from the documentation
cb9d1ea Add version checking support to FindFlex and FindPerlLibs
2010-08-10 14:51:45 -04:00
Brad King
430336c5e1 Merge branch 'findsubversion_fphsa_cleanup'
into ImprovedVersionCheckingInSomeModules

Conflicts:
	Modules/FindSubversion.cmake
2010-08-10 14:50:00 -04:00
Brad King
cc31f89c17 Merge topic 'module-header-spelling'
2cde67a Modules: Fix spelling 'To distributed' -> 'To distribute'
2010-08-10 14:33:47 -04:00
Brad King
4b432328a2 Merge topic 'mingw-response-files'
b03f4ec No response files with GNU ld <= 2.16 (#10913)
2010-08-10 14:33:01 -04:00
Brad King
fab51e6f8d Merge topic 'findsubversion_fphsa_cleanup'
a918bd5 FindSubversion: set compatibility variables based on FPHSA()
2010-08-10 14:32:19 -04:00
Brad King
ab994bfe88 Merge topic 'findzlib_use_fphsa'
5f183ca FindZLIB: use the FPHSA version mode
2010-08-10 14:31:26 -04:00
Brad King
499e1c9598 Merge topic 'find-boost'
187e969 FindBoost: Search for Boost 1.43 and 1.44
2fec615 FindBoost: Search for Boost 1.42
2010-08-10 14:30:35 -04:00
Arjen Verweij
4b1e5f0152 Pass objects to Intel linker using a response file
Use response files for C and CXX languages with the Intel compiler on
Windows.  We already used them for Fortran.  This enables creation of
libraries and executables with a very large number of object files.
2010-08-10 09:34:12 -04:00
Todd Gamblin
2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Alex Neundorf
b6c61561d6 Use FPHSA() in FindSWIG, including version checking.
Alex
2010-08-07 23:18:17 +02:00
Alex Neundorf
656cd2fad2 Improved version checking for FindCUDA using the new mode of FPHSA
Alex
2010-08-07 23:09:14 +02:00
Alex Neundorf
126db7b060 Improved version checking for FindSubversion using the new mode of FPHSA()
Alex
2010-08-07 23:00:31 +02:00
Alex Neundorf
77d909b559 Fix DETAILS string with version number in FHPSA()
If found, the version which was found should be stored in the DETAILS
string, but it was dereferenced twice, which was wrong.

Alex
2010-08-07 22:30:06 +02:00