summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* 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
| | |
| * | 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