summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | | | | | | cmGeneratorTarget: Trace cmSourceFile objects instead of strings.Stephen Kelly2014-04-061-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverses the decision in commit d38423ec (cmTarget: Add a method to obtain list of filenames for sources., 2014-03-17). The cmSourceFile based API is preferred because that avoids creation of many cmSourceFileLocation objects for matching strings, and the result is cached by cmTarget.
| * | | | | | | | | | | | cmTarget: Cache the cmSourceFiles in GetSourceFiles.Stephen Kelly2014-04-062-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling GetSourceFiles with the same result container multiple times when tracing target dependencies. The result from the previous configuration is cached and used later otherwise.
| * | | | | | | | | | | | cmTarget: Extract a ProcessSourceItemCMP0049 method.Stephen Kelly2014-04-062-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling AddSource for each src filename. That involves checking each entry for uniqueness and creating a separate generator expression for each one. Instead, add a single entry for the list of sources. The source files are passed through a uniqueness filter at generate-time, so duplicates don't matter so much.
| * | | | | | | | | | | | Ninja: Query custom commands once per target, not once per file.Stephen Kelly2014-04-052-7/+8
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Computing the source files is now more expensive, so the Ninja generator became very slow with a large number of files.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-071-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-061-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-051-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge topic 'hpux-compile'Brad King2014-04-042-2/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be53734d CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC f4b9c6bb CompileFlags: Test for C++ features after selecting flags
| * | | | | | | | | | CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCCRolf Eike Beer2014-04-042-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These flags are needed to enable support for C++98. Also teach the 'bootstrap' script to add them if necessary.
| * | | | | | | | | | CompileFlags: Test for C++ features after selecting flagsRolf Eike Beer2014-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some flags we select may affect availability of C++ features.
* | | | | | | | | | | Merge topic 'fix-CTestTestFailedSubmit-ftp-for-osx-system-curl'Brad King2014-04-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63d864a0 Tests: Fix CTestTestFailedSubmit-ftp with OS X system libcurl
| * | | | | | | | | | | Tests: Fix CTestTestFailedSubmit-ftp with OS X system libcurlAlex Ciobanu2014-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X 10.9 the system libcurl has a different error message when failing to connect: Failed connect to :21; Connection refused Match this message to pass the test.
* | | | | | | | | | | | Merge topic 'compiler-warning-cleanup'Brad King2014-04-0426-52/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c190245 Remove extra semicolons from C++ code. 4bef02e7 cmTypeMacro: Add a class to eat the semicolon following the macro use. ff710539 Remove default labels from fully covered switch statements.
| * | | | | | | | | | | | Remove extra semicolons from C++ code.Stephen Kelly2014-04-0320-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang based tools running over the code complain about these, but clang has a fixit for removing them.
| * | | | | | | | | | | | cmTypeMacro: Add a class to eat the semicolon following the macro use.Stephen Kelly2014-04-032-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same workaround to the cmCPackTypeMacro. Additionally change that macro to not use 'class' as a macro parameter.
| * | | | | | | | | | | | Remove default labels from fully covered switch statements.Stephen Kelly2014-04-035-7/+0
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow compilers to warn when new enum values are added, making switches no-longer fully-covered.
* | | | | | | | | | | | Merge topic 'remove-stray-aborts'Brad King2014-04-041-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4059a21 cmTarget: Remove abort() after INTERNAL_ERROR reports
| * | | | | | | | | | | | cmTarget: Remove abort() after INTERNAL_ERROR reportsBrad King2014-04-031-2/+0
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After reporting an internal error we should continue rather than aborting. Remove such statements that are left from debugging.
* | | | | | | | | | | | Merge topic 'Qt4Macros-moc-performance'Brad King2014-04-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7beba986 Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function
| * | | | | | | | | | | Qt4Macros: Make QT4_CREATE_MOC_COMMAND a functionRobert Maynard2014-04-031-2/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT4_CREATE_MOC_COMMAND is given a moc_flags argument that contains the COMPILE_DEFINITIONS and a potentially large list of include directories. Since it is a macro, the ${moc_flags} reference is replaced with this content and sent through cmMakefile::ExpandVariablesInString (EVIS). Since commit v3.0.0-rc1~138^2 (Qt4: Use generator expression in COMPILE_DEFINITIONS, 2014-01-13) the COMPILE_DEFINITIONS value contains a '$' so the EVIS fast-path is no longer used. Instead the full cmCommandArgumentParserHelper is now used on the large input, which is very slow (since it was originally created for hand-written code). Change QT4_CREATE_MOC_COMMAND to a function instead of a macro to avoid passing large content through EVIS. This makes it significantly faster.
* | | | | | | | | | | Merge topic 'update-kwsys'Brad King2014-04-043-12/+46
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23b4abb2 Merge branch 'upstream-kwsys' into update-kwsys eccc425a KWSys 2014-04-02 (39f98b5d)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-04-033-12/+46
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | KWSys 2014-04-02 (39f98b5d)KWSys Robot2014-04-033-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 39f98b5d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' a8aa1014..39f98b5d Brad King (1): 39f98b5d Encoding: Add self-assignment check to CommandLineArguments Jiri Malak (1): 36982798 SystemTools: add Watcom single Quote processing Change-Id: Ib8e67dc0c29ee62e6489c068987e4206fa4adaf3
generated by cgit v0.12 at 2025-01-18 07:54:18 (GMT)