summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmAlgorithms-cleanup'Brad King2015-03-1247-11/+62
|\ | | | | | | | | | | | | 95dd238f cmRemoveDuplicates: Fix iterator -> const_iterator. 4448f175 cmInstalledFile: Move Property implementation out of line. 7916d7ba Include cmAlgorithms where it is used.
| * cmRemoveDuplicates: Fix iterator -> const_iterator.Stephen Kelly2015-03-101-1/+1
| |
| * cmInstalledFile: Move Property implementation out of line.Stephen Kelly2015-03-102-10/+13
| | | | | | | | Don't require re-building the world when changing cmAlgorithms.h.
| * Include cmAlgorithms where it is used.Stephen Kelly2015-03-1044-0/+48
| |
* | Merge topic 'cmAlgorithms-early-return'Brad King2015-03-121-1/+5
|\ \ | | | | | | | | | | | | 3ff95f3b cmAlgorithms: Add early return in cmRemoveIndices.
| * | cmAlgorithms: Add early return in cmRemoveIndices.Stephen Kelly2015-03-101-1/+5
| |/ | | | | | | | | Avoid derefencing the iterator and segfaulting if the range is empty.
* | Merge topic 'allow-no-language-standard'Brad King2015-03-121-2/+2
|\ \ | | | | | | | | | | | | 77534e84 Add options to build CMake without any language dialects
| * | Add options to build CMake without any language dialectsBrad King2015-03-101-2/+2
| |/ | | | | | | | | | | If CMake_NO_<LANG>_STANDARD is set, do not set CMAKE_<LANG>_STANDARD. This will allow users to build with their own -std= flags without CMake adding any itself.
* | Merge topic 'vs-Intel-Fortran-map-more-flags'Brad King2015-03-121-0/+7
|\ \ | | | | | | | | | | | | 18d5a4bc VS: Add more Fortran compiler flags to flag table (#15381)
| * | VS: Add more Fortran compiler flags to flag table (#15381)Oyvind Jensen2015-03-101-0/+7
| | | | | | | | | | | | | | | | | | Due to a difference in how AdditionalOptions are implemented in the Fortran component of VS and the C/C++ component, flags that are not listed in the flag table are at risk of being overwritten.
* | | Merge topic 'main_dependency_diagnostic'Brad King2015-03-1217-0/+132
|\ \ \ | | | | | | | | | | | | | | | | 242c3966 add_custom_command: Diagnose MAIN_DEPENDENCY limitation.
| * | | add_custom_command: Diagnose MAIN_DEPENDENCY limitation.Nils Gladitz2015-03-0917-0/+132
| | | | | | | | | | | | | | | | | | | | The new policy CMP0057 diagnoses reuse of the same MAIN_DEPENDENCY across multiple custom commands.
* | | | Merge topic 'fix_jacoco_coverage_process'Brad King2015-03-123-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c771f9d9 CTest: Fix Jacoco Coverage
| * | | | CTest: Fix Jacoco CoverageJoseph Snyder2015-03-063-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the example jacoco.xml file to be jacoco.xml.in to stop CMake from apptempting to calculate Jacoco Coverage when running over itself. Enclose a push of -1 to the coverage vector to only happen if there is a fin to calculate for. This prevents a crash if the target file doesn't exist.
* | | | | CMake Nightly Date StampKitware Robot2015-03-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-111-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2015-03-100-0/+0
|\ \ \ \
| * | | | CMake 3.2.1v3.2.1Brad King2015-03-101-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2015-03-100-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'UseSWIG-fix-CMP0054-warnings' into releaseBrad King2015-03-091-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'ninja-check-root-robustly' into releaseBrad King2015-03-092-3/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'configure_file-NEWLINE_STYLE-no-warn' into releaseBrad King2015-03-0928-42/+61
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'custom-command-multiple-outputs' into releaseBrad King2015-03-076-74/+88
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'target-language-genex'Brad King2015-03-1080-177/+756
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 232a6883 Help: Add release notes for target-language-genex. 9e168941 File(GENERATE): Process genex evaluation files for each language. b734fa44 Genex: Allow COMPILE_LANGUAGE when processing include directories. 0b945ea9 Genex: Allow COMPILE_LANGUAGE when processing compile definitions. 5c559f11 Genex: Enable use of COMPILE_LANGUAGE for compile options. e387ce7d Genex: Add a COMPILE_LANGUAGE generator expression. 4a0128f4 VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when needed
| * | | | | | | | | Help: Add release notes for target-language-genex.Stephen Kelly2015-03-101-0/+9
| | | | | | | | | |
| * | | | | | | | | File(GENERATE): Process genex evaluation files for each language.Stephen Kelly2015-03-097-16/+70
| | | | | | | | | |
| * | | | | | | | | Genex: Allow COMPILE_LANGUAGE when processing include directories.Stephen Kelly2015-03-0919-46/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue an error if this is encountered by an IDE generator.
| * | | | | | | | | Genex: Allow COMPILE_LANGUAGE when processing compile definitions.Stephen Kelly2015-03-0924-42/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue an error if this is encountered by an IDE generator.
| * | | | | | | | | Genex: Enable use of COMPILE_LANGUAGE for compile options.Stephen Kelly2015-03-0919-12/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-ups will allow the use of the generator expression for compile definitions and include directories for non-IDE generators.
| * | | | | | | | | Genex: Add a COMPILE_LANGUAGE generator expression.Stephen Kelly2015-03-0726-6/+162
| | | | | | | | | |
| * | | | | | | | | VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when neededBrad King2015-03-071-70/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These placeholders are used only in the .dsp templates for targets that actually compile sources.
* | | | | | | | | | Merge topic 'ExternalProject-byproducts-tokens'Brad King2015-03-103-3/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86032ae0 ExternalProject: Replace placeholder tokens in BYPRODUCTS
| * | | | | | | | | | ExternalProject: Replace placeholder tokens in BYPRODUCTSGaëtan Lehmann2015-03-093-3/+29
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the developer to specify the byproducts relative to the binary directory without the need to set the binary directory location explicitly.
* | | | | | | | | | Merge topic 'UseSWIG-fix-CMP0054-warnings'Brad King2015-03-101-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 458c9e95 UseSWIG: Avoid if() auto-dereferene in quoted arguments
| * | | | | | | | | UseSWIG: Avoid if() auto-dereferene in quoted argumentsBrad King2015-03-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect against variables named "CSHARP", "PERL", "PYTHON", or "UNKNOWN" when CMP0054 is not set to NEW. Reported-by: Tuukka Pasanen <tuukka@iocaste.ilmi.fi>
* | | | | | | | | | Merge topic 'ninja-check-root-robustly'Brad King2015-03-102-3/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a6b09085 Ninja: Improve internal check for generating at the top-level (#15436)
| * | | | | | | | | Ninja: Improve internal check for generating at the top-level (#15436)Brad King2015-03-092-3/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply check for whether the local generator has a parent instead of depending on a string comparison of directory names.
* | | | | | | | | Merge topic 'configure_file-NEWLINE_STYLE-no-warn'Brad King2015-03-1028-42/+61
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 024e25e4 Tests: Add more signature tests to RunCMake.configure_file test 3ef776fc configure_file: Do not warn about newline style arguments
| * | | | | | | | Tests: Add more signature tests to RunCMake.configure_file testBrad King2015-03-0927-42/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the test cases from Tests/CMakeTests/ConfigureFileTest.cmake.in over to use the RunCMake.configure_file infrastructure. This does much more robust verification of CMake output for each test case, and would have caught the regression fixed in our parent commit.
| * | | | | | | | configure_file: Do not warn about newline style argumentsBrad King2015-03-091-0/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unknown argument warning added by commit v3.2.0-rc1~452^2 (configure_file: Warn about unknown arguments, 2014-10-31) failed to account for options handled by the NewLineStyle member instead of directly in the main loop. Simply whitelist them for now.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-03-101-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'cbp-unit-targets'Brad King2015-03-092-33/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 099b0cab CodeBlocks: Declare which source file belongs to which targets.
| * | | | | | | CodeBlocks: Declare which source file belongs to which targets.Nils Gladitz2015-03-062-33/+42
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow the consuming IDE to determine which target specific preprocessor definitions and include directories are relevant for a given source file.
* | | | | | | Merge topic 'fix-wixobj-filenames'Brad King2015-03-092-3/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e16aff1 CPackWIX: Fix .wixobj output locations and filenames. b0852ebc CPackWIX: Support patching of root <Feature> elements.
| * | | | | | | CPackWIX: Fix .wixobj output locations and filenames.Nils Gladitz2015-03-061-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve all but the last extension when generating .wixobj output filenames from source files and make sure they are unique. Output .wixobj files in cpack staging area instead of the current working directory.
| * | | | | | | CPackWIX: Support patching of root <Feature> elements.Nils Gladitz2015-03-062-2/+5
| |/ / / / / /
* | | | | | | Merge topic 'update-kwsys'Brad King2015-03-092-16/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44ef4700 Merge branch 'upstream-kwsys' into update-kwsys aa84d26e KWSys 2015-03-03 (4890f30c)
| * \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-03-042-16/+124
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | KWSys 2015-03-03 (4890f30c)KWSys Robot2015-03-042-16/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 4890f30c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' d2aa1afd..4890f30c Domen Vrankar (2): 5d6204e9 Glob: Handle symlink cycles in directory paths 4890f30c Glob: Add support for directory listing Change-Id: Id8b77dabf8f50efeffdeaf1c826154fd2a25e17b
* | | | | | | | Merge topic 'custom-command-multiple-outputs'Brad King2015-03-096-74/+88
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | 66a9c90c Makefile: Fix multiple custom command outputs regression (#15116)