Commit Graph

2543 Commits

Author SHA1 Message Date
Brad King 8e76221754 Merge topic 'FindGTK2_10688'
7828932 10688: FindGTK2.cmake doesn't auto-detect macports
2010-09-01 08:42:18 -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
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