summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-02-251-0/+27
|\ | | | | | | | | dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
| * VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-02-241-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge topic 'AddNewEclipseVersions'Brad King2016-02-253-4/+14
|\ \ | | | | | | | | | | | | | | | aff38945 Eclipse: only add C/CXX macros if the language is enabled 6ee6b17e Eclipse: add newer version numbers
| * | Eclipse: only add C/CXX macros if the language is enabledAlex Neundorf2016-02-242-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, the builtin macros and include dirs are only added to the project file if the C/CXX langauges are really enabled. I.e. before this patch the CXX-stuff was in the project file as soon as CXX had been enabled at least once for this build tree. I.e. disabling CXX later on did not remove the CXX macros etc. from the project file (related to #15150) Alex
| * | Eclipse: add newer version numbersAlex Neundorf2016-02-241-0/+4
| | | | | | | | | | | | Alex
* | | Merge topic 'test-cmake_parse_arguments'Brad King2016-02-252-0/+29
|\ \ \ | | | | | | | | | | | | | | | | 43025124 cmake_parse_arguments: Additional regression tests
| * | | cmake_parse_arguments: Additional regression testsDimitar Yordanov2016-02-242-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add regression tests for the arguments handling in cmake_parse_arguments. The tests were run also against cmake 3.4.1 maint branch to verify that there are no regressions. Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com> Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
* | | | CMake Nightly Date StampKitware Robot2016-02-251-1/+1
| |/ / |/| |
* | | Merge branch 'release'Brad King2016-02-240-0/+0
|\ \ \
| * \ \ Merge branch 'doc-typos' into releaseBrad King2016-02-241-5/+5
| |\ \ \
| * \ \ \ Merge branch 'doc-cmake-E-details' into releaseBrad King2016-02-191-4/+8
| |\ \ \ \
* | \ \ \ \ Merge topic 'doc-typos'Brad King2016-02-241-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | 33507e2a Help: Fix typos in cmake-packages.7 manual
| * | | | Help: Fix typos in cmake-packages.7 manualAshley Whetter2016-02-241-5/+5
| | | | |
* | | | | Merge topic 'CodeBlocksParallelFlag'Brad King2016-02-243-13/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 84ccd4f7 CodeBlocks: generate parallel project files (make -j)
| * | | | | CodeBlocks: generate parallel project files (make -j)Alex Neundorf2016-02-233-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done the same way as for Eclipse: cmake tries to determine the number of CPUs, and then adds the respective -jN to the make invocations in the project file. Alex
* | | | | | Merge topic 'xcode-refactor-xcodeobject'Brad King2016-02-242-63/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b860a925 Xcode: Refactor block writes to allow any level of nesting
| * | | | | | Xcode: Refactor block writes to allow any level of nestingRobert Goulet2016-02-242-63/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'xcode-remove-reftype'Brad King2016-02-241-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 572797f9 Xcode: Write refType only for Xcode 1.5
| * | | | | | | Xcode: Write refType only for Xcode 1.5Gregor Jasny2016-02-241-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This field is not expected by newer versions.
* | | | | | | Merge topic 'update-kwsys'Brad King2016-02-247-17/+144
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d010ba9f Merge branch 'upstream-KWSys' into update-kwsys a132064b KWSys 2016-02-22 (4847aedd)
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-02-227-17/+144
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-02-22 (4847aedd)
| | * | | | | | | KWSys 2016-02-22 (4847aedd)KWSys Upstream2016-02-227-17/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 4847aedde22b0026accbb71e5480ed353a330e02 (master). Upstream Shortlog ----------------- Ben Boeckel (1): de83c4d4 SystemTools: support deleting junction points Chuck Atkins (1): 3e1b7395 SystemInformation: Ignore buffers and cache when reporting host memory use Costy Petrisor (1): 9fe15333 Update hidden includes to support CMake header dependency scanning Zack Galbreath (1): 4847aedd Process: Allow timeout to be changed after child starts
* | | | | | | | | Merge topic 'doc-cmake-E-details'Brad King2016-02-241-4/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | b3475030 Help: Clarify `cmake -E` command behavior with respect to file existence
| * | | | | | | | Help: Clarify `cmake -E` command behavior with respect to file existenceBartosz Kosiorek2016-02-191-4/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'test-XCTest-sdkroot'Brad King2016-02-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set
| * | | | | | | | Tests: Fix XCTest when ENV{SDKROOT} is setBrad King2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the host OS X version as the deployment target for this test. This breaks if the SDKROOT environment variable specifies an incompatible SDK version. Explicitly specify `macosx` as the SDK so that CMake will automatically select a version matching the deployment target.
* | | | | | | | | Merge topic 'test-FindPackageModeMakefileTest-optionally'Brad King2016-02-241-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c05678ad Tests: Add option to disable FindPackageModeMakefileTest
| * | | | | | | | | Tests: Add option to disable FindPackageModeMakefileTestBrad King2016-02-191-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test does not work in all environments, so add an option to disable it.
* | | | | | | | | Merge topic 'revert-automoc-src-per-dir'Brad King2016-02-246-59/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 091b649e Revert "Automoc: Fix support of files with the same name (#12873)"
| * | | | | | | | | Revert "Automoc: Fix support of files with the same name (#12873)"Brad King2016-02-196-59/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly <steveire@gmail.com>
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-241-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-231-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-221-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-02-211-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-02-201-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'cpack-deb-autodep-ORIGIN-RPATH'Brad King2016-02-192-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8daee5b CPack/Deb $ORIGIN handling in rpath b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps
| * | | | | | | | CPack/Deb $ORIGIN handling in rpathDomen Vrankar2016-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release not for fix of bug 12431
| * | | | | | | | CPack/Deb Create DEBIAN directory for dpkg-shlibdepsFlorian Apolloner and John Knottenbelt2016-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then dpkg-shlibdeps searches for the DEBIAN directory in order to resolve $ORIGIN in the rpath to a directory. We need to create the DEBIAN directory for this to work.
* | | | | | | | | Merge topic 'reduce-entropy-consumption'Brad King2016-02-191-4/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f23f18ab cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) b13a74b3 cmSystemTools: Remove unused include <fcntl.h>
| * | | | | | | | | cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976)Cristian Rodríguez2016-02-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read `/dev/urandom` without buffering to avoid taking more than we need.
| * | | | | | | | | cmSystemTools: Remove unused include <fcntl.h>Brad King2016-02-191-2/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not seem to need this header anymore, and including it on AIX causes `#define open open64` which breaks `std::ifstream::open` calls.
* | | | | | | | | Merge topic 'unix-timestamps'Brad King2016-02-196-9/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier
| * | | | | | | | | CMake: Extend TIMESTAMP sub-commands with new unix time format specifierJose-Luis Blanco-Claraco2016-02-186-9/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `%s` format specifier is substituted by file()/string() `TIMESTAMP` sub-commands with the number of seconds since unix-epoch (1970-01-01 00:00:00 UTC). Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
* | | | | | | | | | Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'Brad King2016-02-191-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
| * | | | | | | | | CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) optionDaniel Wirtz2016-02-181-2/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-191-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2016-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | CMake 3.5.0-rc3v3.5.0-rc3Brad King2016-02-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2016-02-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-02-171-3/+13
| |\ \ \ \ \ \ \ \