summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Clarify ordering of list(REMOVE_DUPLICATES)Kyle Edwards2019-02-273-1/+9
| | | | | This also adds a test to enforce the order behavior of list(REMOVE_DUPLICATES).
* Merge topic 'ninja-dyndep-lang-aware'Brad King2019-02-275-97/+184
|\ | | | | | | | | | | | | | | | | | | | | | | f22c18b1c1 ninja: name dyndep internal files using the object file 7c78adca8e cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndep 933dd91642 ninja: do not assume explicit preprocessing uses that output 2c0a7bc770 ninja: pass language to cmake_ninja_depends 72f9bb2993 ninja: make dyndep generation language aware 2dd0cb7aeb Help: note that Ninja also uses OBJECT_OUTPUTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2997
| * ninja: name dyndep internal files using the object fileBen Boeckel2019-02-252-6/+6
| | | | | | | | | | Now that preprocessing outputs are not necessarily used all the way through, the output name is a better base name to use for these files.
| * cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndepBen Boeckel2019-02-251-2/+3
| | | | | | | | | | Not all languages compile the preprocessed source (or even have preprocessed sources at all).
| * ninja: do not assume explicit preprocessing uses that outputBen Boeckel2019-02-252-26/+53
| | | | | | | | | | | | In Fortran, this is OK, but for C++, compiling preprocessed source generally results in poorer diagnostic messages and can also be ill-formed anyways.
| * ninja: pass language to cmake_ninja_dependsBen Boeckel2019-02-252-40/+85
| |
| * ninja: make dyndep generation language awareBen Boeckel2019-02-254-22/+36
| | | | | | | | | | A target may have multiple languages with dyndep rules, separate `.dd` files should be generated.
| * Help: note that Ninja also uses OBJECT_OUTPUTSBen Boeckel2019-02-251-3/+3
| |
* | Merge topic 'autogen_variable_names'Brad King2019-02-274-38/+38
|\ \ | | | | | | | | | | | | | | | | | | 63191b169e Autogen: Use more readable variable names for static const AUTO* strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3026
| * | Autogen: Use more readable variable names for static const AUTO* stringsSebastian Holtermann2019-02-264-38/+38
| | |
* | | Merge topic 'ctest-clean-compress'Brad King2019-02-277-2103/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b5a69c6279 cmcompress: Delete unused 3rdParty module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3019
| * | | cmcompress: Delete unused 3rdParty moduleRegina Pfeifer2019-02-257-2103/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-02-270-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'cmake_role-vs-fix' into release-3.14Brad King2019-02-273-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3028
| * \ \ \ \ Merge branch 'docs-rpath-origin-apple' into release-3.14Brad King2019-02-271-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3020
| * \ \ \ \ \ Merge branch 'FindOctave-remove' into release-3.14Brad King2019-02-2710-266/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3027
| * \ \ \ \ \ \ Merge branch 'include_external_msproject-exclude-from-all' into release-3.14Brad King2019-02-271-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3025
| * \ \ \ \ \ \ \ Merge branch 'vs-llvm-extension' into release-3.14Brad King2019-02-271-2/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3024
| * \ \ \ \ \ \ \ \ Merge branch 'restore-min-cmake-3.1' into release-3.14Brad King2019-02-271-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3021
* | \ \ \ \ \ \ \ \ \ Merge topic 'cmake_role-vs-fix'Brad King2019-02-273-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e795be115e Merge branch 'master' into cmake_role-vs-fix 4b95e7fe63 CMAKE_ROLE: Fix value in --build for Visual Studio generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3028
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cmake_role-vs-fixKyle Edwards2019-02-26309-3060/+4264
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | / / | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | CMAKE_ROLE: Fix value in --build for Visual Studio generatorsKyle Edwards2019-02-263-1/+8
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18990
* | | | | | | | | | Merge topic 'docs-rpath-origin-apple'Brad King2019-02-271-7/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf10f02441 Help: Fix minor inaccuracies of what BUILD_RPATH_USE_ORIGIN affects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3020
| * | | | | | | | | Help: Fix minor inaccuracies of what BUILD_RPATH_USE_ORIGIN affectsCraig Scott2019-02-271-7/+7
| | | | | | | | | |
* | | | | | | | | | Merge topic 'FindOctave-remove'Brad King2019-02-2710-266/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1f3fe041 FindOctave: Remove module pending further work Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3027
| * | | | | | | | | FindOctave: Remove module pending further workBrad King2019-02-2610-266/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FindOctave` module added by commit 170bcb6fdc (FindOctave: Add module to find GNU octave, 2018-11-17, v3.14.0-rc1~283^2) has a few problems in its implementation that need to be worked out before the module can be included in a CMake release. These were missed during review. Remove the module for now. It can be restored later with a fresh review. Issue: #18991
* | | | | | | | | Merge topic 'include_external_msproject-exclude-from-all'Brad King2019-02-271-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3106cf4e3d include_external_msproject: Restore support for EXCLUDE_FROM_ALL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3025
| * | | | | | | | include_external_msproject: Restore support for EXCLUDE_FROM_ALLBrad King2019-02-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) all `AddNewTarget` call sites were updated to copy the directory-level `EXCLUDE_FROM_ALL` into the target property of the same name, except that the one for `include_external_msproject` was incorrectly missed. Add it now. Furthermore, refactoring in commit b99129d2d8 (ENH: some code cleanup, 2007-03-12, v2.6.0~2020) accidentally set the `EXCLUDE_FROM_ALL` target property of `include_external_msproject`-generated targets to `FALSE` instead of simply leaving it unset. This was not necessary but had no effect until the above commit gave it a meaning. Drop that. Fixes: #18986
* | | | | | | | | Merge topic 'vs-llvm-extension'Brad King2019-02-271-2/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8375c303e2 VS: Fix detection of clang-cl with -T llvm Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3024
| * | | | | | | | VS: Fix detection of clang-cl with -T llvmBrad King2019-02-261-2/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a VS generator with `-T llvm`, MSBuild relies on the "LLVM Compiler Toolchain" VS Extension. This does not put `clang-cl` in the `PATH` inside the build, and LLVM no longer provides a `cl` replacement either. Therefore we need another way to extract the path to the `CMAKE_{C,CXX}_COMPILER`. Fortunately the LLVM VS integration provides a `$(ClangClExecutable)` macro we can reference to get the path. Fixes: #18983
* | | | | | | | Merge topic 'restore-min-cmake-3.1'Brad King2019-02-271-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d4430d66 Tests: Restore support for CMake 3.1 through 3.6 with MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3021
| * | | | | | | Tests: Restore support for CMake 3.1 through 3.6 with MSVCBrad King2019-02-261-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit a5dd159990 (Tests: Fix RunCMake.try_compile CxxStandard case on MSVC, 2017-09-22, v3.10.0-rc1~63^2) introduced use of `if()` conditions not supported until CMake 3.7, so while it was intended to restore support for CMake versions prior to 3.9, it actually only did so for 3.7 and 3.8. Backport the logic to work with CMake 3.1. Fixes: #18987
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-271-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'cpack-rpm++'Brad King2019-02-261-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3ffe90598 CPackRPM: Fix packaging in folders with ++ in name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3008
| * | | | | | CPackRPM: Fix packaging in folders with ++ in nameHarry Mallon2019-02-251-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct a regex that can match a path with special characters instead of treating the path as a regex directly. Fixes: #18967
* | | | | | | Merge topic 'vs-wince-no-deploy'Brad King2019-02-269-17/+154
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 917c035ada VS: support suppressing deployment of selected targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2991
| * | | | | | | VS: support suppressing deployment of selected targetsWil Stark2019-02-259-17/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_NO_SOLUTION_DEPLOY` target property to explicitly specify for each target whether to suppress VS solution deployment of the generated target project. Fixes: #18953
* | | | | | | | Merge topic 'update-kwsys'Brad King2019-02-263-113/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6eebee194 Merge branch 'upstream-KWSys' into update-kwsys 11fe7c9063 KWSys 2019-02-25 (833b2470) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3018
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-02-253-113/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-02-25 (833b2470)
| | * | | | | | | | KWSys 2019-02-25 (833b2470)KWSys Upstream2019-02-253-113/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 833b24703f5b45e09193687d56c2cdc5aedf834d (master). Upstream Shortlog ----------------- Brad King (1): 363bf5ab Configure: Drop Large File Support macro definitions
* | | | | | | | | | Merge topic 'add-xlclang'Brad King2019-02-2640-125/+329
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9d285c5ad jsoncpp: Fix include order for build within CMake 0d489fab19 libuv: fix atomic ops compilation with xlclang 1699f5c231 Utilities: Suppress warnings in third-party code when using XLClang f709089d84 XLClang: Extract compiler implicit include directories 5c41386357 XLClang: Add policy CMP0089 to present as XL for compatibility 8278237933 XL: Remove overlap with the new XLClang compiler ID 6f5cf2d2c6 XL: Revert "Recognize compilers identified by __ibmxl__" 90c6156aa8 XLClang: Add a new compiler ID for the clang-based XL compiler ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2921
| * | | | | | | | | | jsoncpp: Fix include order for build within CMakeBrad King2019-02-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the KWSys `Configure.h` header first to get its large file support definitions before including system headers.
| * | | | | | | | | | libuv: fix atomic ops compilation with xlclangBrad King2019-02-251-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Utilities: Suppress warnings in third-party code when using XLClangBrad King2019-02-258-8/+8
| | | | | | | | | | |
| * | | | | | | | | | XLClang: Extract compiler implicit include directoriesBrad King2019-02-256-2/+91
| | | | | | | | | | |
| * | | | | | | | | | XLClang: Add policy CMP0089 to present as XL for compatibilityBrad King2019-02-257-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now identify IBM's Clang-based XL compilers, which define `__ibmxl__`, as `XLClang` rather than `XL`. In order to support existing project code that checks for `XL`, add a policy whose OLD behavior is to present the compiler id as `XL` and whose NEW behavior is to present the compiler id as `XLClang` as we really detect it.
| * | | | | | | | | | XL: Remove overlap with the new XLClang compiler IDChuck Atkins2019-02-252-60/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 6555286c55 (XL: Add C and C++ language level flags, 2017-04-27, v3.9.0-rc1~184^2) we added support for both the traditional XL compiler and the Clang-based variant used on Linux. The latter is now handled by `Modules/Compiler/XLClang-{C,CXX}.cmake` using the `XLClang` compiler id. Drop the corresponding content from the traditional XL compiler modules.
| * | | | | | | | | | XL: Revert "Recognize compilers identified by __ibmxl__"Brad King2019-02-254-26/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit eb1a9be4b6 (XL: Recognize compilers identified by __ibmxl__, 2018-03-05, v3.11.0-rc3~4^2). It is no longer needed because we now use `__ibmxl__` to identify with compiler id `XLClang`.
| * | | | | | | | | | XLClang: Add a new compiler ID for the clang-based XL compilerChuck Atkins2019-02-259-0/+95
| | | | | | | | | | |
| * | | | | | | | | | XL: Look for CreateExportList only on AIXBrad King2019-02-252-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool comes with XL on AIX but not on Linux. Move the infrastructure to find and use it to the AIX-specific modules.
generated by cgit v0.12 at 2025-01-04 12:01:12 (GMT)