summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack.hash_computing'Brad King2016-09-2011-13/+116
|\ | | | | | | | | | | 1c63aa4d CPack: Add option to generate a checksum file next to each package file 4682b42b Tests: Add subtest support to RunCMake/CPack infrastructure
| * CPack: Add option to generate a checksum file next to each package filePetr Orlov2016-09-198-1/+76
| | | | | | | | Add variable CPACK_PACKAGE_CHECKSUM to activate it.
| * Tests: Add subtest support to RunCMake/CPack infrastructureDomen Vrankar2016-09-193-12/+40
| |
* | Merge topic 'ifw-package-resources'Brad King2016-09-205-0/+138
|\ \ | | | | | | | | | | | | b807cd9b CPackIFW: Add 'cpack_ifw_add_package_resources' command
| * | CPackIFW: Add 'cpack_ifw_add_package_resources' commandKonstantin Podsvirov2016-09-195-0/+138
| |/
* | Merge topic 'ExternalProject-HTTP_HEADER'Brad King2016-09-204-3/+23
|\ \ | | | | | | | | | | | | | | | 5e6716db Help: Add notes for topic 'ExternalProject-HTTP_HEADER' 0f424c3d ExternalProject: Add HTTP_HEADER
| * | Help: Add notes for topic 'ExternalProject-HTTP_HEADER'Brad King2016-09-191-0/+5
| | |
| * | ExternalProject: Add HTTP_HEADERRuslan Baratov2016-09-193-3/+18
| | |
* | | Merge topic 'cuda_use_cudadevrt_with_separable_compilation'Brad King2016-09-201-0/+13
|\ \ \ | | | | | | | | | | | | | | | | 891e0ebd FindCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ON
| * | | FindCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ONRobert Maynard2016-09-201-0/+13
| | | | | | | | | | | | | | | | | | | | Issue: #15157 Patch-by: l0calh05t on gitlab.kitware.com
* | | | Merge topic 'cmake-server-experimental-protocols'Brad King2016-09-207-12/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7df8a8f2 server-mode: Add --experimental flag
| * | | | server-mode: Add --experimental flagTobias Hunger2016-09-207-12/+49
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Allow for experimental cmProtocolVersions, which will only ever get listed if the server was started with the (undocumented) "--experimental" flag. Mark current protocol version 1.0 as experimental.
* | | | Merge topic 'cleanup-Convert'Brad King2016-09-2029-291/+286
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6429d6d9 cmOutputConverter: Remove now-obsolete Convert method ad790617 Convert: Inline uses of START_OUTPUT 4cf707b0 Convert: Remove HOME_OUTPUT enum value 3d12ffbf Ninja: Update comment variable reference 4d69ac76 Convert: Move access to BinaryDirectory out of loops e7c89567 Convert: Inline uses of HOME_OUTPUT dc510919 Common: Use a string instead of enum for WorkingDirectory 76833149 Convert: Simplify switch dc95020e Convert: Remove obsolete MAKERULE enum value 1825f876 Convert: Move access to BinaryDirectory out of loops 25c39ac2 Convert: Inline HOME_OUTPUT MAKERULE conversion 516e79ba Convert: Inline MAKERULE conversions e13e519e Convert: Move access to BinaryDirectory out of loops 34c6e995 Convert: Avoid HOME_OUTPUT enum when converting to relative paths 839c65bc Convert: Move access to CurrentBinaryDirectory out of loops 21b5fdf9 Convert: Avoid START_OUTPUT enum when converting to relative paths ...
| * | | | cmOutputConverter: Remove now-obsolete Convert methodStephen Kelly2016-09-194-56/+0
| | | | |
| * | | | Convert: Inline uses of START_OUTPUTStephen Kelly2016-09-197-57/+107
| | | | |
| * | | | Convert: Remove HOME_OUTPUT enum valueStephen Kelly2016-09-192-4/+0
| | | | |
| * | | | Ninja: Update comment variable referenceStephen Kelly2016-09-191-1/+2
| | | | |
| * | | | Convert: Move access to BinaryDirectory out of loopsStephen Kelly2016-09-192-6/+4
| | | | |
| * | | | Convert: Inline uses of HOME_OUTPUTStephen Kelly2016-09-193-7/+14
| | | | |
| * | | | Common: Use a string instead of enum for WorkingDirectoryStephen Kelly2016-09-195-14/+14
| | | | |
| * | | | Convert: Simplify switchStephen Kelly2016-09-191-5/+4
| | | | | | | | | | | | | | | | | | | | Make it more clear what is happening here.
| * | | | Convert: Remove obsolete MAKERULE enum valueStephen Kelly2016-09-192-4/+1
| | | | |
| * | | | Convert: Move access to BinaryDirectory out of loopsStephen Kelly2016-09-193-39/+21
| | | | |
| * | | | Convert: Inline HOME_OUTPUT MAKERULE conversionStephen Kelly2016-09-196-34/+66
| | | | |
| * | | | Convert: Inline MAKERULE conversionsStephen Kelly2016-09-193-6/+4
| | | | | | | | | | | | | | | | | | | | This is a trivial use of a static method.
| * | | | Convert: Move access to BinaryDirectory out of loopsStephen Kelly2016-09-193-11/+7
| | | | |
| * | | | Convert: Avoid HOME_OUTPUT enum when converting to relative pathsStephen Kelly2016-09-199-17/+18
| | | | |
| * | | | Convert: Move access to CurrentBinaryDirectory out of loopsStephen Kelly2016-09-198-41/+42
| | | | |
| * | | | Convert: Avoid START_OUTPUT enum when converting to relative pathsStephen Kelly2016-09-1910-39/+45
| | | | |
| * | | | Convert: Remove obsolete HOME and START enum valuesStephen Kelly2016-09-192-10/+0
| | | | |
| * | | | Convert: Remove last uses of HOME enum valueStephen Kelly2016-09-193-8/+8
| | | | |
| * | | | Convert: Remove last use of START enum valueStephen Kelly2016-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enums just introduce unfamiliar names and don't provide value. The order of arguments is reversed, as that is the result of the cmOutputConverter::ConvertToRelativePath overload which accepts the RelativeRoot enum.
| * | | | Xcode: Remove unused memberStephen Kelly2016-09-192-4/+0
| |/ / / | | | | | | | | | | | | | | | | It is unused since commit v3.4.0-rc1~492^2~3 (Remove CMAKE_USE_RELATIVE_PATHS variable., 2015-06-01).
* | | | CMake Nightly Date StampKitware Robot2016-09-201-1/+1
|/ / /
* | | Merge topic 'cmake-server-basic'Brad King2016-09-1922-11/+1388
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7263667c Help: Add notes for topic 'cmake-server-basic' 5adde4e7 cmake-server: Add documentation b63c1f6c cmake-server: Add unit test d341d077 cmake-server: Implement ServerProtocol 1.0 b13d3e0d cmake-server: Bare-bones server implementation cd049f01 cmake-server: Report server mode availablitily in Capabilities
| * | | Help: Add notes for topic 'cmake-server-basic'Brad King2016-09-191-0/+6
| | | |
| * | | cmake-server: Add documentationTobias Hunger2016-09-193-0/+192
| | | |
| * | | cmake-server: Add unit testTobias Hunger2016-09-196-0/+316
| | | |
| * | | cmake-server: Implement ServerProtocol 1.0Tobias Hunger2016-09-193-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the initial handshake of the client to complete the connection to the server. The handshake sets the protocol version that client and server will use to talk to each other. The only way to change this is to quit the server and start over. CMake specific information is also set during the initial handshake. Since cmake so far never had to change basic information about any project while running, it was decided to keep this information static and require a restart of the cmake server to change any of these.
| * | | cmake-server: Bare-bones server implementationTobias Hunger2016-09-1910-0/+707
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a bare-bones cmake-server implementation and makes it possible to start that with "cmake -E server". Communication happens via stdin/stdout for now. Protocol is based on Json objects surrounded by magic strings ("[== CMake Server ==[" and "]== CMake Server ==]"), which simplifies Json parsing significantly. This patch also defines an interface used to implement different versions of the protocol spoken by the server, but does not include any protocol implementaiton.
| * | | 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
| | | | |