summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ghs-link-flags'Brad King2016-03-292-3/+34
|\ | | | | | | | | | | 36ad8dd4 GHS: Implement link flags and dirs for non-target groups (#16029) 230d50ed GHS: Factor out compiler information shared among languages
| * GHS: Implement link flags and dirs for non-target groups (#16029)Geoff Viola2016-03-282-3/+34
| |
* | CMake Nightly Date StampKitware Robot2016-03-291-1/+1
|/
* Merge topic 'only_change_timeout_once'Brad King2016-03-281-0/+2
|\ | | | | | | | | 06b7f5d2 CTest: Only apply the secondary test timeout once
| * CTest: Only apply the secondary test timeout onceZack Galbreath2016-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | This commit fixes a bug in the implementation of the test property TIMEOUT_AFTER_MATCH. The new timeout value was being applied every time a line was output by the test after the match had been encountered. Now the new timeout value is only set once. This commit also improves some output formatting related to this property.
* | CMake Nightly Date StampKitware Robot2016-03-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-251-1/+1
| |
* | Merge topic 'fix-variable_watch-reallocation'Brad King2016-03-243-10/+19
|\ \ | | | | | | | | | | | | c6104028 Avoid occasional use-after-free when a variable watch is executed
| * | Avoid occasional use-after-free when a variable watch is executedYves Frederix2016-03-233-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-lookup a variable value when an associated VariableWatch is executed in cmMakefile::GetDefinition. This fixes a problem with 'def' sometimes becoming invalid due to memory reallocation inside an std::vector. In this case, the problem was that if the call to VariableAccessed actually executed a callback function, the internal state of the makefile has changed due to the associated function scope being pushed. This in turn implies that a new cmDefinitions instance was pushed in cmMakefile::VarTree. As cmLinkedTree is based on an std::vector, this push can have triggered reallocation of its internal memory buffer. However, as the value of 'def', which was computed on method entry, actually points to a property of one of the cmDefinitions instances in cmMakefile::VarTree, reallocation can invalidate the value of 'def' so that it cannot simply be returned at the end of the function. The solution implemented here is to simply lookup the value of 'def' again.
* | | Merge topic 'cmake-depend-in-project-only'Brad King2016-03-241-0/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b06e17da Help: Add notes for topic 'cmake-depend-in-project-only' 52540245 Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable b1e1aa1e Makefile: Optionally scan only source and build trees for dependencies
| * | | Makefile: Optionally scan only source and build trees for dependenciesAttila Krasznahorkay2016-03-221-0/+61
| | | | | | | | | | | | | | | | Add a `CMAKE_DEPENDS_IN_PROJECT_ONLY` variable to activate the behavior.
* | | | Merge topic 'vs-startup-project'Brad King2016-03-243-9/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad140c6e VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER f069be05 VS: Fix default target support for targets nested inside a folder c05ea485 VS: Improve unit test macros 78ec0461 VS: Add option to choose the `.sln` startup project (#15578)
| * | | | VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDERTaylor Braun-Jones2016-03-231-7/+1
| | | | |
| * | | | VS: Fix default target support for targets nested inside a folderTaylor Braun-Jones2016-03-231-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | It's not actually the first target in a `.sln` file that is treated as the default startup project, but rather the first fully defined target.
| * | | | VS: Add option to choose the `.sln` startup project (#15578)Davy Durham2016-03-223-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_STARTUP_PROJECT` directory property to specify the project that should be placed first in the `.sln` file so that it will be selected as the default startup project. Co-Author: Taylor Braun-Jones <taylor.braunjones@avigilon.com>
* | | | | CMake Nightly Date StampKitware Robot2016-03-241-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'use-cmXMLWriter'Brad King2016-03-2314-813/+928
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51465da1 CPack/IFW: port to cmXMLWriter 754485af cmExtraEclipseCDT4Generator: port to cmXMLWriter c45671b0 cmGlobalKdevelopGenerator: port to cmXMLWriter dcdc270e cmExtraCodeLiteGenerator: port to cmXMLWriter 27e09764 cmExtraCodeBlocksGenerator: port to cmXMLWriter d7407621 cmXMLWriter: add Doctype() method dd27e313 cmXMLWriter: overload Element() method for empty elements
| * | | | CPack/IFW: port to cmXMLWriterDaniel Pfeifer2016-03-236-103/+81
| | | | |
| * | | | cmExtraEclipseCDT4Generator: port to cmXMLWriterDaniel Pfeifer2016-03-232-380/+328
| | | | |
| * | | | cmGlobalKdevelopGenerator: port to cmXMLWriterDaniel Pfeifer2016-03-231-146/+205
| | | | |
| * | | | cmExtraCodeLiteGenerator: port to cmXMLWriterDaniel Pfeifer2016-03-211-93/+149
| | | | |
| * | | | cmExtraCodeBlocksGenerator: port to cmXMLWriterDaniel Pfeifer2016-03-212-91/+147
| | | | |
| * | | | cmXMLWriter: add Doctype() methodDaniel Pfeifer2016-03-212-0/+9
| | | | |
| * | | | cmXMLWriter: overload Element() method for empty elementsDaniel Pfeifer2016-03-212-0/+9
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-231-1/+1
| | | | |
* | | | | Merge topic 'timeout_after_match'Brad King2016-03-225-0/+62
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | de7afd29 Help: Add notes for topic 'timeout_after_match' 993e48d0 CTest: Optionally use a secondary test timeout after matching output
| * | | | CTest: Optionally use a secondary test timeout after matching outputZack Galbreath2016-03-225-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a test N seconds to complete after we detect a matching line in its output. Activate this behavior with a new TIMEOUT_AFTER_MATCH test property.
* | | | | Merge topic 'ghs-try_compile'Brad King2016-03-221-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bf3e76d2 GHS: Fix try_compile (#15975)
| * | | | | GHS: Fix try_compile (#15975)Geoff Viola2016-03-211-2/+8
| | |/ / / | |/| | |
* | | | | Merge topic 'ninja-directory-targets'Brad King2016-03-222-0/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ead71df Help: Add notes for topic 'ninja-directory-targets' e9bf8ec8 Ninja: Add test for `$subdir/all` targets ca575fe9 Ninja: Add `$subdir/all` targets
| * | | | | Ninja: Add `$subdir/all` targetsCharles Huet2016-03-182-0/+85
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make all` to build all targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/all` at the top of the tree to build the targets in the corresponding subdirectory. Port logic from cmGlobalUnixMakefileGenerator3::WriteDirectoryRule2 to cmGlobalNinjaGenerator in order to produce equivalent directory-level targets.
* | | | | CMake Nightly Date StampKitware Robot2016-03-221-1/+1
| |/ / / |/| | |
* | | | Merge topic 'cpack-osx-optional-CoreServices'Brad King2016-03-212-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d84ba668 CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)
| * | | | CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)Brad King2016-03-182-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers on OS X report errors in the CoreServices framework headers. Check for support of the header ahead of time and compile the relevant code only when the header is available.
* | | | | CMake Nightly Date StampKitware Robot2016-03-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-191-1/+1
| |/ / / |/| | |
* | | | Merge topic 'cmake-gui-osx-identifier'Brad King2016-03-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7b990e82 cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)
| * | | | cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)Brad King2016-03-171-0/+1
| | |_|/ | |/| |
* | | | Merge topic 'cpack-osx-no-carbon'Brad King2016-03-182-16/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | c718070c CPack: Avoid requiring Carbon framework on OS X (#16021)
| * | | CPack: Avoid requiring Carbon framework on OS X (#16021)Sean McBride2016-03-172-16/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~232^2 (CPackDMG: Add support for multilingual SLAs, 2015-10-19) we added use of the Carbon framework in order to get access to its APIs to convert Script Manager RegionCode values. This is not necessary. Instead we can use CoreServices. While at it, replace individual CoreFoundation includes with including the entire framework, which is the correct way.
| * | CMake 3.5.0v3.5.0Brad King2016-03-081-1/+1
| | |
| * | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-03-071-0/+28
| |\ \
| | * | VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-03-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
| * | | CMake 3.5.0-rc3v3.5.0-rc3Brad King2016-02-181-1/+1
| | | |
| * | | Merge branch 'fix-static-private-non-target-depends' into releaseBrad King2016-02-172-5/+23
| |\ \ \
| * \ \ \ Merge branch 'fix-cmake_parse_arguments-expansion' into releaseBrad King2016-02-121-2/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-gui-reset-generator' into releaseBrad King2016-02-121-0/+7
| |\ \ \ \ \