summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-04-141-1/+1
|
* CMake Nightly Date StampKitware Robot2014-04-131-1/+1
|
* CMake Nightly Date StampKitware Robot2014-04-121-1/+1
|
* Merge branch 'release'Brad King2014-04-110-0/+0
|\
| * Merge branch 'rc-windres-with-dot' into releaseBrad King2014-04-111-5/+6
| |\
| * \ Merge branch 'Fortran-pgi-intel-arch' into releaseBrad King2014-04-101-0/+4
| |\ \
| * \ \ Merge branch 'CMakeDetermineVSServicePack-vs-11-update-4' into releaseBrad King2014-04-101-41/+17
| |\ \ \
* | \ \ \ Merge topic 'CMakeDetermineVSServicePack-vs-11-update-4'Brad King2014-04-111-41/+17
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | f0de3f80 CMakeDetermineVSServicePack: Add VS 11 update 4 105658df CMakeDetermineVSServicePack: Match versions more robustly 101515b9 CMakeDetermineVSServicePack: Format documentation
| * | | | CMakeDetermineVSServicePack: Add VS 11 update 4Brad King2014-04-101-1/+3
| | | | |
| * | | | CMakeDetermineVSServicePack: Match versions more robustlyBrad King2014-04-101-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CMAKE_MATCH_* variables to simplify matching logic. Match either 3 or 4 version components. Do not fail when there are only three components available.
| * | | | CMakeDetermineVSServicePack: Format documentationBrad King2014-04-101-10/+8
| | | | | | | | | | | | | | | | | | | | Also state explicitly that the module is deprecated.
* | | | | Merge topic 'Fortran-pgi-intel-arch'Brad King2014-04-111-0/+4
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | eb8cb2c6 Fortran: Detect pointer size on Intel archs with PGI (#14870)
| * | | | Fortran: Detect pointer size on Intel archs with PGI (#14870)Brad King2014-04-101-0/+4
| |/ / / | | | | | | | | | | | | | | | | The PGI compiler does not define __SIZEOF_POINTER__ so use the __x86_64__ or __i386__ CPU macros to select a pointer size instead.
* | | | Merge topic 'qthelp_names'Brad King2014-04-113-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 111bb67c Help: Use a more-appropriate qthelp namespace and file name.
| * | | | Help: Use a more-appropriate qthelp namespace and file name.Stephen Kelly2014-04-103-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Use the namespace org.cmake instead of org.sphinx.cmake. Add the version to the output file name.
* | | | | Merge topic 'revert-Android-platform'Brad King2014-04-111-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4b31f064 Revert "Modules: Add an Andriod platform file"
| * | | | | Revert "Modules: Add an Andriod platform file"Stephen Kelly2014-04-101-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 77f06b145d57c4665ff5d71b89a70c54a009ad14. It may be re-added in the future when the requirements for that platform are better known and supported by CMake.
* | | | | Merge topic 'rc-windres-with-dot'Brad King2014-04-111-5/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865) db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation
| * | | | CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)Brad King2014-04-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A 64-bit MinGW windres is named "i686-w64-mingw32.shared-windres". The get_filename_component NAME_WE mode may strip the ".shared-windres" part and cause the result to no longer contain "windres". Instead, match the "windres" name in the full CMAKE_RC_COMPILER value first, and use the get_filename_component code path only for other resource compilers.
| * | | | CMakeRCInformation: Do not mention 'Fortran' in documentationBrad King2014-04-111-2/+2
| | |/ / | |/| | | | | | | | | | This module is for the Windows Resource Compiler, not Fortran.
* | | | Merge topic 'watcom-link-quoting'Brad King2014-04-119-31/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cb9b1e13 Watcom: Use single quote for all file/path items in wlink command
| * | | | Watcom: Use single quote for all file/path items in wlink commandJiri Malak2014-04-089-31/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Watcom Linker use single quote if necessary for quoting target name, libraries names and libraries search path. Object names were already fixed.
* | | | | CMake Nightly Date StampKitware Robot2014-04-111-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'install-prefix-in-interface'Brad King2014-04-1037-6/+290
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 783bce29 Export: Disallow exported interface includes in src/build tree (#14592). c869984e RunCMake: Allow specifying the source dir and file to test.
| * | | | Export: Disallow exported interface includes in src/build tree (#14592).Stephen Kelly2014-04-0933-3/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow directories in the source tree or build tree only if the install tree is a subdirectory of the source tree or build tree, as appropriate. Re-use the test files in the RunCMake.include_directories test to run in multiple scenarios. Bump the required CMake version in the test to 3.0 to ensure that the new policy warnings are emitted correctly.
| * | | | RunCMake: Allow specifying the source dir and file to test.Stephen Kelly2014-04-064-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow decoupling the name of the test from the name and location of the source file under test, which means one source file can be used for multiple tests. Rename the PARENT_SCOPE test in RunCMake.set to not use a keyword of the if() command as a file name. As the filename is now used with an if condition, this causes a conflict.
* | | | | Merge topic 'suppress-warning-in-comment'Brad King2014-04-104-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fe65c3 cmSystemTools: Remove unreachable return on HP compiler 72e137ea Re-word comment on unreachable return statements
| * | | | | cmSystemTools: Remove unreachable return on HP compilerBrad King2014-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 1de08685 (cmSystemTools: Restore unreachable return to silence warnings, 2014-04-02) by excluding the unreachable return on the HP compiler as well as Clang. Both recognize that it is unreachable and warn.
| * | | | | Re-word comment on unreachable return statementsBrad King2014-04-074-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the word "warning" in the comment because CTest launchers match it and CTestCustom.cmake.in does not suppress it.
* | | | | | Merge topic 'update-kwsys'Brad King2014-04-102-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f401b925 Merge branch 'upstream-kwsys' into update-kwsys c54be583 KWSys 2014-04-07 (8b085635)
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-04-082-2/+14
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | KWSys 2014-04-07 (8b085635)KWSys Robot2014-04-082-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 8b085635 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 39f98b5d..8b085635 Rolf Eike Beer (2): a99a9235 set the compile flags for older HP compilers to fix compilation 8b085635 MD5: avoid casting back and forth between size_t and int Change-Id: I6386b521dbaba2e4f9ed5b2be34a504b9c17fc36
* | | | | | | Merge topic 'aix-compile'Brad King2014-04-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 539b6c58 Fix build on AIX failing because of access to string elements
| * | | | | | | Fix build on AIX failing because of access to string elementsRolf Eike Beer2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compilation failed with this error message: .../Source/cmCryptoHash.cxx: In method `string cmCryptoHash::HashString (const string &)': .../Source/cmCryptoHash.cxx:41: non-lvalue in unary `&' This was introduced in 77f60392d93f41a8828d3db1d7b76d45f1535d07 (stringapi: Accept strings when MD5 hashing data).
* | | | | | | | Merge topic 'ExternalProject_VCS-quiet'Brad King2014-04-101-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dad1c14 ExternalProject: Find VCS packages quietly
| * | | | | | | | ExternalProject: Find VCS packages quietlyDaniele E. Domenichelli2014-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keeps the VCS packages out from FeatureSummary output, unless the INCLUDE_QUIET_PACKAGES is used.
* | | | | | | | | Merge topic 'optimize-source-file-processing'Brad King2014-04-103-8/+65
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f1c71fd cmTarget: Add all sources traced from custom commands at once. b1c3ae33 cmTarget: Short-circuit language computation if context independent.
| * | | | | | | | | cmTarget: Add all sources traced from custom commands at once.Stephen Kelly2014-04-093-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AddSource method accepts one file and tries to avoiding adding it to the sources-list of the target if it already exists. This involves creating many cmSourceFileLocation objects for matching on existing files, which is an expensive operation. Avoid the searching algorithm by appending the new sources as one group. Generate-time processing of source files will ensure uniqueness. Add a new AddTracedSources for this purpose. The existing AddSources method must process the input for policy CMP0049, but as these source filenames come from cmSourceFile::GetFullPath(), we can forego that extra processing.
| * | | | | | | | | cmTarget: Short-circuit language computation if context independent.Stephen Kelly2014-04-092-6/+32
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Computing the language involves computing the source files, which is an expensive operation. It requires calling cmMakefile::GetOrCreateSource many times, which involves creating and matching on many cmSourceFileLocation objects. Source files of a target may depend on the head-target and the config as of commit e6971df6 (cmTarget: Make the source files depend on the config., 2014-02-13). The results are cached for each context as of commit c5b26f3b (cmTarget: Cache the cmSourceFiles in GetSourceFiles., 2014-04-05). Each target in the build graph causes language computation of all of its dependents with itself as the head-target. This means that for 'core' libraries on which everything depends, the source files are computed once for every transitive target-level-dependee and the result is not cached because the head-target is different. This was observed in the VTK buildsystem. Short circuit the computation for targets which have a source-list that is independent of the head-target. If the source-list has already been computed and the generator expression evaluation reports that it was context-independent, return the only source-list already cached for the target. Reset the short-circuit logic when sources are added and when the link libraries are re-computed.
* | | | | | | | | Merge branch 'release'Brad King2014-04-100-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'Qt4Macros-moc-performance' into releaseBrad King2014-04-031-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'revise-compiler-id-policies' into releaseBrad King2014-04-027-26/+82
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix_policy_diagnostics' into releaseBrad King2014-04-0220-112/+34
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'clang-warnings' into releaseBrad King2014-04-021-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-Qt-manual-typo' into releaseBrad King2014-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-101-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-091-1/+1
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-081-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'optimize-source-file-processing'Brad King2014-04-075-47/+100
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4e6bf8e cmTarget: Make GetSourceFiles string overload private. 92e2fbe1 cmGeneratorTarget: Trace cmSourceFile objects instead of strings. c5b26f3b cmTarget: Cache the cmSourceFiles in GetSourceFiles. eb163f37 cmTarget: Extract a ProcessSourceItemCMP0049 method. 19b7c22d Ninja: Query custom commands once per target, not once per file.
| * | | | | | | | | | | | cmTarget: Make GetSourceFiles string overload private.Stephen Kelly2014-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consumers should use the cmSourceFile overload, which is now always the case.