summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FixAsmSupport'Brad King2013-06-143-4/+4
|\ | | | | | | | | bc460ea asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
| * asm support: adapt to changes in CMakeDetectCompiler in 2.8.10Alex Neundorf2013-06-143-4/+4
| | | | | | | | | | | | | | | | This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was modified (or added), and now the _INIT variable must not be set to a list anymore, before it worked. Alex
* | Merge topic 'suppress-unused-cli-with-value-in-cache'Brad King2013-06-141-1/+1
|\ \ | | | | | | | | | | | | 6a6cda5 Don't run the WarnUnusedCliUnused test on Windows.
| * | Don't run the WarnUnusedCliUnused test on Windows.Stephen Kelly2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even with the NMake Makefiles generator, it is not able to properly clean up after the test. http://open.cdash.org/testDetails.php?test=193424220&build=2934501 Internal cmake changing into directory: C:/Dashboards/My Tests/CMake-nmake10-x64-continuous/Tests/WarnUnusedCliUnused Error: cmake execution failed CMake Error: Error: generator : NMake Makefiles Does not match the generator used previously: Visual Studio 10 Either remove the CMakeCache.txt file or choose a different binary directory.
* | | Merge topic 'minor-cleanup'Brad King2013-06-143-6/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e3b7eac Style: Don't put an else after a return. ad304a2 cmSystemTools: Fix typo in comment. 08319e0 Genex: Fix indentation in docs.
| * | | Style: Don't put an else after a return.Stephen Kelly2013-06-111-3/+0
| | | |
| * | | cmSystemTools: Fix typo in comment.Stephen Kelly2013-06-111-1/+1
| | | |
| * | | Genex: Fix indentation in docs.Stephen Kelly2013-06-111-2/+2
| | | |
* | | | Merge topic 'remove_extra_matches'Brad King2013-06-141-6/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dc03499 Do not set CMAKE_MATCH_ variables when not neeeded
| * | | | Do not set CMAKE_MATCH_ variables when not neeededBill Hoffman2013-06-141-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each call to AddDefinition has overhead for variable watches and such. Avoid extra calls when not needed. This decreases the configure time for ParaView by 10 seconds on my machine. Without the change about 1,000,000 set-to-empty calls were being made. After the change it drops to about 100,000.
* | | | | Merge topic 'rpath-on-mac'Brad King2013-06-141-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff01f8b OS X: Improvements for getting install name of dylib.
| * | | | | OS X: Improvements for getting install name of dylib.Clinton Stimpson2013-06-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a multi-arch dylib where none of the architectures is the host architecture, otool -D returned multiple install names.
* | | | | | CMake Nightly Date StampKitware Robot2013-06-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-06-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-06-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-06-111-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2013-06-101-0/+23
|\ \ \ \ \
| * | | | | CMake 2.8.11.1v2.8.11.1Brad King2013-06-052-1/+24
| | | | | |
| * | | | | Merge branch 'fix-genex-HEAD-target' into releaseBrad King2013-06-053-4/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'xcode-framework-paths' into releaseBrad King2013-06-051-11/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-include_directories-whitespace-handling' into releaseBrad King2013-06-053-2/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-qt4_use_modules-QtAx' into releaseBrad King2013-06-031-8/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'find-Qt4-granular-modules' into releaseBrad King2013-06-031-20/+34
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'escape-regex-specials-in-path' into releaseBrad King2013-06-037-36/+52
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindBoost-normalize-slashes' into releaseBrad King2013-05-311-2/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ExternalData-no-re-stage' into releaseBrad King2013-05-314-1/+47
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test-INCLUDE_DIRECTORIES-genex-read' into releaseBrad King2013-05-313-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-INCLUDE_DIRECTORIES-genex-read' into releaseBrad King2013-05-311-37/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-try_compile-library-spaces' into releaseBrad King2013-05-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-FileIsDirectory-SEGV' into releaseBrad King2013-05-311-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-101-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-091-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-081-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-071-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-061-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge topic 'fix-genex-HEAD-target'Brad King2013-06-053-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b22235 Genex: Fix the HEAD target used for evaluated expressions
| * | | | | | | | | | | | | | | | | Genex: Fix the HEAD target used for evaluated expressionsStephen Kelly2013-06-053-4/+20
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the expression $<TARGET_PROPERTY:prop> appears in the content of a target property, the target that prop is read from is the 'head target' of the expression. In contexts such as evaluating the content of a target property during generation, such as INCLUDE_DIRECTORIES, the 'head target' is the one on which the initial request was made. If evaluating a generator expression which is not a target property content, the target must be explicitly specified. Such contexts include add_custom_command and file(GENERATE). The content might then look like $<TARGET_PROPERTY:tgt,prop> However, as there is no HeadTarget set, any generator expressions evaluated as part of reading prop from tgt which do not specify the tgt directly report an error. Modify the logic of the TARGET_PROPERTY generator expression so that in such contexts, the 'head target' is set to the appropriate target which was first encountered.
* | | | | | | | | | | | | | | | | Merge topic 'xcode-framework-paths'Brad King2013-06-051-11/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
| * | | | | | | | | | | | | | | | Xcode: Fix framework search paths in STATIC library targets (#14191)Brad King2013-06-041-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2bc22bda (Xcode: Add frameworks search paths from link dependeny closure, 2012-12-07) we made framework search paths from the link closure conditional on target type, skipping it on STATIC and OBJECT library targets that do not actually link. However, the framework search paths also influence the compile lines (-F options) so we need them for all target types. The Makefile generator already does this, as did the Xcode generator prior to the above-mentioned commit.
* | | | | | | | | | | | | | | | | Merge topic 'fix-path-root-dot-dot'Brad King2013-06-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d26800b get_filename_component: Test ABSOLUTE of .. after root component
| * | | | | | | | | | | | | | | | | get_filename_component: Test ABSOLUTE of .. after root componentBrad King2013-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the RunCMake.get_filename_component test to verify that ".." does not remove the root filename component.
* | | | | | | | | | | | | | | | | | Merge topic 'update-kwsys'Brad King2013-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c91e88d Merge branch 'upstream-kwsys' into update-kwsys 6dc3dd9 KWSys 2013-06-03 (d79a792e)
| * | | | | | | | | | | | | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | KWSys 2013-06-03 (d79a792e)KWSys Robot2013-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d79a792e | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dccf7725..d79a792e Brad King (1): d79a792e SystemTools: Fix CollapseFullPath to not erase root component Change-Id: I25c6600a621a960738b5afc0ba73f63df0693303
* | | | | | | | | | | | | | | | | | | Merge topic 'doc-CMAKE_PARENT_LIST_FILE'Brad King2013-06-051-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b62d440 Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)
| * | | | | | | | | | | | | | | | | | | Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)Brad King2013-06-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the wording of the documentation for CMAKE_PARENT_LIST_FILE to clarify that it only applies to the include stack in the current directory. Specify exactly what commands can include files instead of saying "somehow invoke".
* | | | | | | | | | | | | | | | | | | | Merge topic 'suppress-unused-cli-with-value-in-cache'Brad King2013-06-055-12/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 273ecab CLI: Suppress the unused warning if the key value pair is cached.
| * | | | | | | | | | | | | | | | | | | CLI: Suppress the unused warning if the key value pair is cached.Stephen Kelly2013-06-045-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is common to specify a CMAKE_TOOLCHAIN_FILE and get a warning for using it despite it not being used. The WarnUnusedCliUnused test relies on the warning being emitted each time cmake is run on an existing build. That behavior is changed by this patch to warn only on the first invokation of CMake, and not on subsequent invokations (because the variable is in the cache with the same value). For that test, a clean target is added which clears the cache and cause the warning to be emitted each time. As the Ninja generator does not support the feature needed to test this, it is not tested with that generator.
* | | | | | | | | | | | | | | | | | | | Merge topic 'cleanups'Brad King2013-06-052-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation. db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method.
| * | | | | | | | | | | | | | | | | | | | Add some spaces to the INCLUDE_DIRECTORIES documentation.Stephen Kelly2013-06-041-6/+6
| | | | | | | | | | | | | | | | | | | | |
generated by cgit v0.12 at 2025-02-14 08:56:34 (GMT)