summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-E-sha'Brad King2017-07-1848-40/+175
|\ | | | | | | | | | | | | | | | | c4de0a25 Add sha1sum, sha224sum, sha256sum, sha384sum and sha512sum to command mode c4647d84 Change ComputeFileMD5 to ComputeFileHash 501a4fee Add some unit tests for md5sum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1021
| * Add sha1sum, sha224sum, sha256sum, sha384sum and sha512sum to command modeAndré Klitzing2017-07-1435-22/+139
| |
| * Change ComputeFileMD5 to ComputeFileHashAndré Klitzing2017-07-145-29/+30
| | | | | | | | | | | | | | * Use a parameter to select hash algorithm * Return a std::string as result or an empty string if it fails * Avoids unnecessary copy of hash value
| * Add some unit tests for md5sumAndré Klitzing2017-07-0910-0/+17
| |
* | Merge topic 'GHS_int_detection'Brad King2017-07-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 8eb1cb3f GHS: Correct the regex for the intXXXX directory detection. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1062
| * | GHS: Correct the regex for the intXXXX directory detection.Roman Wüger2017-07-171-1/+1
| | | | | | | | | | | | | | | The int directory does not only need to contain digits. E.g. C:\GHS\int409a is a valid Green Hills installation
* | | Merge topic 'objlib-own-target-objs'Brad King2017-07-186-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d89e10cd Diagnose object library self-reference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1053
| * | | Diagnose object library self-referenceBrad King2017-07-146-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code add_library(A OBJECT a.c) target_sources(A PRIVATE $<TARGET_OBJECTS:A>) used to crash CMake via infinite recursion while evaluating the generator expression. Then the change in commit v3.9.0-rc1~266^2~1 (cmGeneratorTarget: Replace source classifier implementation, 2017-04-07) avoided the infinite recursion because GetKindedSources now creates a map entry and initializes it once. If it is called again on the same target during that initialization, the partially computed results are returned. This is still wrong but does not crash. Detect and diagnose this case instead. Co-Author: Ben Boeckel <ben.boeckel@kitware.com> Fixes: #16578
* | | | CMake Nightly Date StampKitware Robot2017-07-181-1/+1
| | | |
* | | | Merge branch 'release-3.9'Brad King2017-07-170-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'doc-vs2015-update-relnote' into release-3.9Brad King2017-07-141-0/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'xcode9support' into release-3.9Brad King2017-07-142-0/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-fix-lang-std-option-list' into release-3.9Brad King2017-07-141-2/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'TestDriver-fix-Wconversion' into release-3.9Brad King2017-07-141-2/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'doc-vs2015-update-relnote'Brad King2017-07-171-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfa9a2bd Help: Add a 3.9 release note about the VS GenerateDebugInformation update Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1060
| * | | | | | | | Help: Add a 3.9 release note about the VS GenerateDebugInformation updateBrad King2017-07-141-0/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a release note corresponding to the environmental regression fixed by commit v3.9.0-rc6~15^2~1 (VS: Fix GenerateDebugInformation values for v140 and v141 toolsets, 2017-06-27).
* | | | | | | | Merge topic 'TestDriver-fix-Wconversion'Brad King2017-07-171-2/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 221ffabf TestDriver: Fix -Wconversion warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1058
| * | | | | | | TestDriver: Fix -Wconversion warningBrad King2017-07-141-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~51^2~1 (TestDriver: calc NumTests at compile time, 2017-01-24) we convert an expression that uses `sizeof()` to an `int` as a compile-time constant. Some GCC versions warn about this with `-Wconversion`. Add a cast to avoid the warning.
* | | | | | | Merge topic 'xcode9support'Brad King2017-07-172-0/+13
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0348383b Xcode: Add "outputPaths" to custom command script build phase Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1054
| * | | | | | Xcode: Add "outputPaths" to custom command script build phaseHarry Mallon2017-07-142-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for Xcode 9's "New Build System", whose release notes mention "that output must be declared as an explicit output by the script which generates it" in reference to outputs of custom script build phases.
* | | | | | Merge topic 'fix-lang-std-option-list'Brad King2017-07-171-5/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cef77f06 Allow language extensions without any standard to use a list of options 74e33711 Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list fca05461 cmLocalGenerator: Explain standard flag selection logic in comments 218ce158 Features: Fix support for a list of language standard options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1059
| * | | | | | Allow language extensions without any standard to use a list of optionsBrad King2017-07-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the logic added by commit a2112257 (Add infrastructure to use language extensions without any standard, 2017-06-29) to support a list of options as has been done since commit v3.9.0-rc1~174^2~2 (CompileFeatures: Let STD compile options be a list, 2016-10-05).
| * | | | | | Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-listBrad King2017-07-141-2/+10
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Features: Fix support for a list of language standard optionsBrad King2017-07-141-2/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~174^2~2 (CompileFeatures: Let STD compile options be a list, 2016-10-05) did not change all the places we add the language standard options. Expand the list in the other places.
| * | | | | cmLocalGenerator: Explain standard flag selection logic in commentsBrad King2017-07-141-2/+7
| | | | | |
* | | | | | Merge topic 'FindLibXml2-standard-vars'Brad King2017-07-171-12/+34
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1b38865 FindLibXml2: Switch to standard module variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1043
| * | | | | FindLibXml2: Switch to standard module variable namesVadim Zhukov2017-07-141-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIBXML2_INCLUDE_DIR talks about libxml2 itself; * LIBXML2_INCLUDE_DIRS lists also include directories coming from libxml2's dependencies and is what libxml2 users should use; * LIBXML2_LIBRARY talks about libxml2 itself; * LIBXML2_LIBRARIES is what libxml2 users should link to. This commit doesn't break existing users of FindLibXml2.cmake, but provides the way for correct behaviour in future. In particular, on OpenBSD LIBXML2_INCLUDE_DIR resolves to /usr/local/include/libxml2, while libiconv (an libxml2 dependency) puts iconv.h in /usr/local/include, which is not picked up automatically.
* | | | | | CMake Nightly Date StampKitware Robot2017-07-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-151-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-07-140-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9Brad King2017-07-132-7/+24
| |\ \ \ \
* | \ \ \ \ Merge topic 'cmp0054-asm-warning'Brad King2017-07-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 336c4fc6 CMakeDetermineASMCompiler: fix a CMP0054 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1057
| * | | | | | CMakeDetermineASMCompiler: fix a CMP0054 warningBen Boeckel2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in commit d8e6cd9e (IAR: Improve support for IAR ARM Compiler, 2017-06-15) from !991. Fixes #17062.
* | | | | | | Merge topic 'ninja_cuda_export_compile_commands_support'Brad King2017-07-142-7/+24
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 712af07e CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1055
| * | | | | | CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-132-7/+24
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes: #17061
* | | | | | Merge topic 'vs_csharp_add_custom_command_comment'Brad King2017-07-141-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21ee3309 VS: print comment in CSharp target only if it is actually set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1049
| * | | | | | VS: print comment in CSharp target only if it is actually setMichael Stürmer2017-07-121-1/+5
| | | | | | |
* | | | | | | Merge topic 'CMakePushCheckState-fix-RESET'Brad King2017-07-142-1/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fda50a08 CMakePushCheckState: Fix cmake_push_check_state RESET argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1040
| * | | | | | | CMakePushCheckState: Fix cmake_push_check_state RESET argumentBrad King2017-07-122-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added by commit v2.8.12~138^2 (Add cmake_reset_check_state() macro, 2013-07-28) but has never worked. Fix the implementation to refer to macro arguments properly (not as normal variables). Fixes: #17048
* | | | | | | | CMake Nightly Date StampKitware Robot2017-07-141-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.9'Brad King2017-07-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'android-system-include-last' into release-3.9Brad King2017-07-137-13/+45
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'android-system-include-last'Brad King2017-07-137-13/+45
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bafa392 Android: Always add standard include directories last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1052
| * | | | | | Android: Always add standard include directories lastBrad King2017-07-137-13/+45
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify language-wide system include directories, 2016-05-24) to use `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`. Rather than recognizing this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) worked around the problem by incorrectly removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. By not filtering out `/usr/include` from user-specified include directories, we allow the code include_directories(${CMAKE_SYSROOT}/usr/include) to place the include directory too early on the command line. Fix support for standard include directories to not be filtered by implicit include directories, and do not remove `/usr/include` from the list of implicit include directories for Android builds. Add a test case to verify that an explicit `/usr/include` is ignored in favor of the standard directory at the end. Fixes: #17059
* | | | | | Merge topic 'win10-sdk-request-mismatch'Brad King2017-07-131-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !866
| * | | | | | cmGlobalVisualStudio14Generator: notify when the SDK version doesn't matchBen Boeckel2017-07-131-0/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting an SDK version which is not suitable (e.g., missing `windows.h`), CMake will use the next-best SDK version. Output a message when CMake chooses something different than the requested SDK version. See #16895.
* | | | | | Merge topic 'FindProtobuf-protoc-target'Brad King2017-07-132-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c281acf8 FindProtobuf: add target for protoc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1045
| * | | | | | FindProtobuf: add target for protocAndré Apitzsch2017-07-122-4/+18
| | | | | | |
* | | | | | | Merge topic 'better-exception-reporting'Brad King2017-07-135-14/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c650f39 CTest: Report more detail about system exceptions in tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1046
generated by cgit v0.12 at 2025-02-09 17:46:08 (GMT)