summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | cmake-server: Report server mode availablitily in CapabilitiesTobias Hunger2016-09-193-11/+11
|/ / / | | | | | | | | | | | | Report the availability of the server-mode in the output of cmake -E capabilities.
* | | Merge topic 'cleanup-Convert'Brad King2016-09-194-77/+75
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6afd35b9 cmState: remove unused code 8d47a20f cmOutputConverter: use new ConvertToRelativePath signature internally 149af87b cmOutputConverter: split ConvertToRelativePath
| * | | cmState: remove unused codeDaniel Pfeifer2016-09-172-44/+0
| | | | | | | | | | | | | | | | Remove the code that was used by cmOutputConverter exclusively.
| * | | cmOutputConverter: use new ConvertToRelativePath signature internallyDaniel Pfeifer2016-09-171-6/+4
| | | |
| * | | cmOutputConverter: split ConvertToRelativePathDaniel Pfeifer2016-09-172-27/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the ConvertToRelativePath funtion into ConvertToRelativePath and ForceToRelativePath. Both functions take the local path as a string rather than a vector of path segments. Reimplement the old interface on top of the two new functions for interface compatibility.
* | | | Merge topic 'predictable-add_custom_command-output'Brad King2016-09-192-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 92d76b50 Make the add_custom_command output more predictable
| * | | | Make the add_custom_command output more predictableStephen Kelly2016-09-192-3/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I otherwise get: Expected stderr to match: expect-err> CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): expect-err> add_custom_command given APPEND option with output.* expect-err> which is not already a custom command output. expect-err> Call Stack \(most recent call first\): expect-err> CMakeLists.txt:3 \(include\) Actual stderr: actual-err> CMake Error at AppendNotOutput.cmake:1 (add_custom_command): actual-err> add_custom_command given APPEND option with output actual-err> "/home/stephen/dev/src/cmake/with actual-err> space/Tests/RunCMake/add_custom_command/AppendNotOutput-build/out" which is actual-err> not already a custom command output. actual-err> Call Stack (most recent call first): actual-err> CMakeLists.txt:3 (include) Using a specific line for paths is a style already used elsewhere for the same reason, such as CMP0041 output.
* | | | Merge topic 'clang-tidy-fixes'Brad King2016-09-1938-249/+262
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fab1fef cmNinjaNormalTargetGenerator: make sure comments match parameter names 7b94a7ad cmCommandArgumentsHelper: simplify boolean expression 782fcbb9 Use CM_NULLPTR 809ca6c8 Use braces around statements 516f8edb Avoid else after return d9f5d3c5 Remove redundant get() call on smart pointer 3fda1094 Mark overridden functions with CM_OVERRIDE
| * | | | cmNinjaNormalTargetGenerator: make sure comments match parameter namesDaniel Pfeifer2016-09-161-2/+2
| | | | |
| * | | | cmCommandArgumentsHelper: simplify boolean expressionDaniel Pfeifer2016-09-161-8/+1
| | | | |
| * | | | Use CM_NULLPTRDaniel Pfeifer2016-09-163-5/+5
| | | | |
| * | | | Use braces around statementsDaniel Pfeifer2016-09-162-3/+4
| | | | |
| * | | | Avoid else after returnDaniel Pfeifer2016-09-1630-186/+203
| | | | |
| * | | | Remove redundant get() call on smart pointerDaniel Pfeifer2016-09-161-1/+1
| | | | |
| * | | | Mark overridden functions with CM_OVERRIDEDaniel Pfeifer2016-09-163-45/+47
| |/ / /
* | | | Merge topic 'doc-CPackIFW'Brad King2016-09-191-88/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a327b206 CPackIFW: Format documentation
| * | | | CPackIFW: Format documentationBrad King2016-09-161-88/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Place command documentation in explicit markup blocks and remove horizontal dividers. Use definition lists and bullet lists as appropriate.
* | | | | Merge topic 'ifw-user-interfaces'Brad King2016-09-194-4/+68
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | c2f0f41f CPackIFW: Add USER_INTERFACES option
| * | | | CPackIFW: Add USER_INTERFACES optionPierluigi Taddei2016-09-164-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to CPackIFW the capability of accepting a list of USER_INTERFACES that are copied to the meta folder and added to the component description.
* | | | | Merge topic 'check-for-unique_ptr'Brad King2016-09-194-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | aa50cdac Check for availability of unique_ptr and make_unique when building CMake
| * | | | | Check for availability of unique_ptr and make_unique when building CMakeBrad King2016-09-164-0/+19
| | |/ / / | |/| | | | | | | | | | | | | Some code paths may find these useful if available.
* | | | | Merge topic 'postgresql-96'Brad King2016-09-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dac3af0 FindPostgreSQL: Search for version 9.6 84039a6a FindPostgreSQL: Correct comment about known postgres versions
| * | | | | FindPostgreSQL: Search for version 9.6Tamar Kranenburg2016-09-181-2/+2
| | | | | |
| * | | | | FindPostgreSQL: Correct comment about known postgres versionsTamar Kranenburg2016-09-181-1/+1
| | | | | |
* | | | | | Merge topic 'find-package-mode-fixes'Brad King2016-09-192-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a098ca0d cmake: Fix --find-package mode link line output d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
| * | | | | | cmake: Fix --find-package mode link line outputBrad King2016-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v2.8.10~58^2~2 (Ninja: move -LIBPATH behind -link option, 2012-09-26) added arguments to cmLocalGenerator::GetTargetFlags and updated the call sites. However, in the cmake::FindPackage and cmLocalGenerator::AddBuildTargetRule call sites it added the new arguments in the wrong order. The latter was never used and has been removed. The former remains buggy and prints out compiler flags instead of the link framework/library search paths. Fix its argument order.
| * | | | | | cmGlobalGenerator: Fix use of uninitialized value in --find-package modeBrad King2016-09-161-0/+1
| | | | | | |
* | | | | | | Merge topic 'binaries-as-c++14'Brad King2016-09-192-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0310cb10 Utilities/Release: Build Linux and OS X binaries as C++14
| * | | | | | | Utilities/Release: Build Linux and OS X binaries as C++14Brad King2016-09-162-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | The toolchains we use to build on these platforms support it.
* | | | | | | Merge topic 'nightly-binary-no-ConsoleBuf-test'Brad King2016-09-192-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | ea23db00 Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binaries
| * | | | | | Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binariesBrad King2016-09-192-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test fails spuriously too often. Additional work on the test will be needed to make it more reliable. For now just skip the test when building nightly binaries so they can complete.
* | | | | | CMake Nightly Date StampKitware Robot2016-09-191-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2016-09-181-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-171-1/+1
|/ / / /
* | | | Merge topic 'refactor-target-construction'Brad King2016-09-164-157/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9353d991 cmTarget: Remove unused support for partial construction fa3897b2 cmGlobalGenerator: Refactor global target construction 916d8445 cmGlobalGenerator: Split CreateDefaultGlobalTargets implementation
| * | | | cmTarget: Remove unused support for partial constructionBrad King2016-09-152-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer need to support partial construction for cmTarget instances of type GLOBAL_TARGET. Require all constructor arguments up front.
| * | | | cmGlobalGenerator: Refactor global target constructionBrad King2016-09-152-120/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using partially-constructed cmTarget instances. Collect the information about how to construct each target in a separate structure and then actually create each cmTarget with full construction.
| * | | | cmGlobalGenerator: Split CreateDefaultGlobalTargets implementationBrad King2016-09-152-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | Divide this long method into multiple helpers each dedicated to one of the targets. This also avoids having to clear/re-use local structures.
* | | | | Merge topic 'size-empty'Brad King2016-09-1644-46/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 73f648f1 use empty method to check for emptyness
| * | | | | use empty method to check for emptynessDaniel Pfeifer2016-09-1544-46/+46
| | | | | |
* | | | | | Merge topic 'detect-relink-incompat'Brad King2016-09-161-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72dfca30 ninja: error out on relink requirements
| * | | | | | ninja: error out on relink requirementsBen Boeckel2016-09-151-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja does not support PRE_INSTALL_SCRIPT properties and does not perform the relink required by installation without help from some other mechanism, so error out if it would be required. Issue: #13934, #16304
* | | | | | | Merge topic 'file-curl-httpheader'Brad King2016-09-1610-0/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f6cb366 file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboption
| * | | | | | | file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboptionRuslan Baratov2016-09-1510-0/+58
| | | | | | | |
* | | | | | | | Merge topic 'find_package-dir-sort'Brad King2016-09-1614-17/+341
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31be918b find_package: Optionally sort globbed directories in a meaningful order
| * | | | | | | | find_package: Optionally sort globbed directories in a meaningful orderPierluigi Taddei2016-09-1514-17/+341
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `CMAKE_FIND_PACKAGE_SORT_{ORDER,DIRECTION}` variables to specify sort order and direction. When multiple package with the same name have been found in the same location sorting option can be used to force a specific version to be loaded (e.g. libA_1.12.0 instead of libA_1.1.0). Currently sorting by NAME and by NATURAL order have been implemented. Natural ordering makes use of the `strverscmp(3)` ordering.
* | | | | | | | Merge topic 'ExternalProject-http-credentials'Brad King2016-09-164-3/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cbd04be Help: Add notes for topic 'ExternalProject-http-credentials' e1ca1173 ExternalProject: Add HTTP_{USERNAME,PASSWORD}
| * | | | | | | | Help: Add notes for topic 'ExternalProject-http-credentials'Brad King2016-09-151-0/+5
| | | | | | | | |
| * | | | | | | | ExternalProject: Add HTTP_{USERNAME,PASSWORD}Ruslan Baratov2016-09-153-3/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'file-LOCK-lowercase-test'Brad King2016-09-162-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a788cf30 Tests: Add case for file(LOCK) with lower-cased path