summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Diagnose recursive project/enable_language without crashing (#15999)Brad King2016-03-072-0/+22
| | | | | | | Calling `project()` or `enable_language()` from a toolchain file will infinitely recurse since those commands load the toolchain file. Diagnose and reject this case with an error message instead of crashing when the stack eventually overflows.
* Merge topic 'vs-vcxproj-ConfigurationType'Brad King2016-03-071-35/+43
|\ | | | | | | | | 6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file
| * VS: Add option to set `ConfigurationType` of a .vcxproj fileFabian Otto2016-02-261-35/+43
| | | | | | | | | | | | Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example.
* | CMake Nightly Date StampKitware Robot2016-03-071-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-061-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-051-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-041-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-031-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-021-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-03-011-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-271-1/+1
|/
* Merge topic 'fix_coverage_file_searching'Brad King2016-02-261-2/+18
|\ | | | | | | | | bc29ed54 CTest: Make coverage file selection more specific.
| * CTest: Make coverage file selection more specific.Joseph Snyder2016-02-251-2/+18
| | | | | | | | | | | | | | When performing some other testing, the globs for Blanket.js and Delphi code coverage are picking up unintended files. Change the query for the Delphi coverage to follow the naming convention, and check the second line of the found JSON files for certain text before parsing them as coverage files.
* | Merge topic 'try_compile-target-type'Brad King2016-02-264-15/+68
|\ \ | | | | | | | | | | | | 7f1bd9fe try_compile: Add option to control type of target
| * | try_compile: Add option to control type of targetBrad King2016-02-194-15/+68
| | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_TRY_COMPILE_TARGET_TYPE` option to specify use of `add_library(... STATIC ...)` for the generated test project. This will be useful for cross-compiling toolchains that cannot link a binary without custom flags or scripts.
* | | Merge topic 'file-download-status-hash-mismatch'Brad King2016-02-261-0/+9
|\ \ \ | | | | | | | | | | | | | | | | 6c9586f9 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)
| * | | file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)Brad King2016-02-251-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Although we fail with an error on a hash mismatch, it is not a fatal error so the script may continue processing. If the download itself had no error then report in the STATUS variable that the operation was not successful due to the hash mismatch. Suggested-by: Tobias Hieta <tobias@hieta.se>
* | | CMake Nightly Date StampKitware Robot2016-02-261-1/+1
|/ /
* | 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-252-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2016-02-251-1/+1
|/ / /
* | | Merge topic 'CodeBlocksParallelFlag'Brad King2016-02-242-13/+29
|\ \ \ | | | | | | | | | | | | | | | | 84ccd4f7 CodeBlocks: generate parallel project files (make -j)
| * | | CodeBlocks: generate parallel project files (make -j)Alex Neundorf2016-02-232-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | Merge topic 'revert-automoc-src-per-dir'Brad King2016-02-241-32/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-192-9/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-182-9/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'fix-static-private-non-target-depends'Brad King2016-02-182-5/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87f44b75 Fix export of STATIC library PRIVATE non-target dependencies
| * | | | | | | Fix export of STATIC library PRIVATE non-target dependenciesBrad King2016-02-172-5/+23
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~43^2 (Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW, 2016-01-15) we taught target_link_libraries to generate `$<LINK_ONLY:$<TARGET_NAME:dep>>` in INTERFACE_LINK_LIBRARIES instead of `$<LINK_ONLY:dep>` so that `dep` can be recognized as a target name and updated during export. However, this approach does not work when `dep` is just a plain library name and not a target because `$<TARGET_NAME:...>` requires the name of a reachable target. Since we do not know during target_link_libraries whether the name will correspond to a reachable target or not, we cannot inject the `$<TARGET_NAME:...>` expression. Revert this change and solve the original problem instead by teaching the export logic to recognize and update target names directly in `$<LINK_ONLY:...>` expressions. Reported-by: Ben Boeckel <ben.boeckel@kitware.com>
generated by cgit v0.12 at 2025-02-12 02:13:54 (GMT)