summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ASM: Add missing <INCLUDES> placeholder for "compile" rulesGregor Jasny2016-03-295-5/+5
| | | | | | | | This placeholder was added to the compilation rules for other languages by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) but ASM was incorrectly left out. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* Merge topic 'cpackcomponents-priv-var'Brad King2016-03-251-22/+22
|\ | | | | | | | | c70ac097 CPack: Exclude additional internal variables from CPackConfig.cmake
| * CPack: Exclude additional internal variables from CPackConfig.cmakeNils Gladitz2016-03-241-22/+22
| | | | | | | | | | | | | | | | In v2.8.12.1-654-g7621ad6 I added underscore prefixes to CPACK_ADDCOMP_(STR|UNAME) to prevent them from being automatically written to CPackConfig.cmake. Do the same for CPACK_ADDGRP_(STR|UNAME) and CPACK_INSTTYPE_(STR|UNAME).
* | CMake Nightly Date StampKitware Robot2016-03-251-1/+1
| |
* | Merge branch 'release'Brad King2016-03-240-0/+0
|\ \
| * | CMake 3.5.1v3.5.1Brad King2016-03-241-1/+1
| | |
* | | Merge branch 'release'Brad King2016-03-240-0/+0
|\ \ \ | |/ /
| * | Merge branch 'fix-variable_watch-reallocation' into releaseBrad King2016-03-233-10/+19
| |\ \
| * \ \ Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-03-221-1/+6
| |\ \ \
| * \ \ \ Merge branch 'fix-repeat-pkg-config' into releaseBrad King2016-03-212-6/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'cpack-osx-optional-CoreServices' into releaseBrad King2016-03-182-1/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cmake-gui-osx-identifier' into releaseBrad King2016-03-171-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cpack-osx-no-carbon' into releaseBrad King2016-03-172-16/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ios-install-combined-one-arch' into releaseBrad King2016-03-154-1/+75
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ 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-249-0/+107
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Help: Add notes for topic 'cmake-depend-in-project-only'Brad King2016-03-231-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variableBrad King2016-03-235-0/+29
| | | | | | | | | | |
| * | | | | | | | | | Makefile: Optionally scan only source and build trees for dependenciesAttila Krasznahorkay2016-03-223-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_DEPENDS_IN_PROJECT_ONLY` variable to activate the behavior.
* | | | | | | | | | | Merge topic 'vs-startup-project'Brad King2016-03-2416-10/+122
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-235-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Improve unit test macrosTaylor Braun-Jones2016-03-223-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change `getFirstProject` macro to more flexible version `getProjectNames`
| * | | | | | | | | | | VS: Add option to choose the `.sln` startup project (#15578)Davy Durham2016-03-2213-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | Merge topic 'FindBoost-xl-compiler'Brad King2016-03-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4527b9c4 FindBoost: Add support for IBM XL compiler
| * | | | | | | | | | | | FindBoost: Add support for IBM XL compilerErik Zenker2016-03-231-0/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'doc-cmake_minimum_required-policy-reset'Brad King2016-03-241-18/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dc8486b Help: Organize and clarify `cmake_minimum_required` documentation
| * | | | | | | | | | | | Help: Organize and clarify `cmake_minimum_required` documentationBrad King2016-03-231-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State more explicitly that `cmake_policy(VERSION)` is implied and explain the effects it has.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-241-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'CMakePackageConfigHelpers-relative-prefix'Brad King2016-03-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd31feb0 CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIX
| * | | | | | | | | | | | CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIXSergiu Deitsch2016-03-221-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindCUDA-verbatim'Brad King2016-03-231-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72a97b7a FindCUDA: Fix regression in separate compilation (#16027)
| * | | | | | | | | | | | FindCUDA: Fix regression in separate compilation (#16027)Brad King2016-03-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in path, 2016-01-15) our add_custom_command calls use VERBATIM so that CMake will automatically quote special characters correctly. Fix the separate compilation code path to not add its own quoting when the VERBATIM option will be used.
* | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'release-win64'Brad King2016-03-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cdd6363 Utilities/Release: Skip spurious Qt5Autogen test for nightly win64 binary
| * | | | | | | | | | | | Utilities/Release: Skip spurious Qt5Autogen test for nightly win64 binaryBrad King2016-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test fails spuriously too often and prevents the nightly binary from finishing. Simply skip it for the nightly binary to allow it to complete more regularly.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-231-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'timeout_after_match'Brad King2016-03-2218-0/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de7afd29 Help: Add notes for topic 'timeout_after_match' 993e48d0 CTest: Optionally use a secondary test timeout after matching output
| * | | | | | | | | | | | Help: Add notes for topic 'timeout_after_match'Brad King2016-03-221-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | CTest: Optionally use a secondary test timeout after matching outputZack Galbreath2016-03-2217-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'test-rename-VSSolution'Brad King2016-03-2218-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c1f4da8 Tests: Rename RunCMake.{SolutionGlobalSections => VSSolution}
| * | | | | | | | | | | | Tests: Rename RunCMake.{SolutionGlobalSections => VSSolution}Brad King2016-03-1818-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test will be suitable for covering other `.sln` content too.
generated by cgit v0.12 at 2025-02-15 00:10:35 (GMT)