summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRSHong Xu2019-08-201-1/+2
| | | | | | | | Backslashes in `CUDA_NVCC_INCLUDE_DIRS` cause syntax errors because it is written to a generated `.cmake` script as a string literal. Use a bracket argument to hold the expanded value as we already do for `CUDA_NVCC_COMPILE_DEFINITIONS`. Then explicitly convert backslashes to forward slashes.
* Merge topic 'swift-mode-flags'Brad King2019-08-191-0/+2
|\ | | | | | | | | | | | | | | 4d83e47c05 Swift: define `CMAKE_Swift_FLAGS` correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3684
| * Swift: define `CMAKE_Swift_FLAGS` correctlySaleem Abdulrasool2019-08-121-0/+2
| | | | | | | | | | Invoke `cmake_initialize_per_config_variable` to ensure that build type flags are properly initialised.
* | Merge topic 'string-literal-append'Brad King2019-08-1920-77/+43
|\ \ | | | | | | | | | | | | | | | | | | da26b3be89 avoid adding multiple consecutive string literals to std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3698
| * | avoid adding multiple consecutive string literals to std::stringRolf Eike Beer2019-08-1820-77/+43
| | | | | | | | | | | | While at it change some single character additions to be of type char.
* | | Merge topic 'cmCryptoHash_string_view'Brad King2019-08-194-27/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f1c529c4fb cmCryptoHash: Accept cm::string_view input Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3697
| * | | cmCryptoHash: Accept cm::string_view inputSebastian Holtermann2019-08-184-27/+26
| | | |
* | | | Merge topic 'cmStringAlgorithms_IsOn'Brad King2019-08-1966-329/+309
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b6c62be23 cmSystemTools: Remove IsInternallyOn, IsNOTFOUND, IsOn, IsOff 20e580be01 Source sweep: Use cmIsOn instead of cmSystemTools::IsOn 5b7650216b cmStringAlgorithms: Add cmIsInternallyOn, cmIsNOTFOUND, cmIsOn, cmIsOff Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3691
| * | | | cmSystemTools: Remove IsInternallyOn, IsNOTFOUND, IsOn, IsOffSebastian Holtermann2019-08-172-123/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removes the following methods from cmSystemTools: - `IsInternallyOn` - `IsNOTFOUND` - `IsOn` - `IsOff`
| * | | | Source sweep: Use cmIsOn instead of cmSystemTools::IsOnSebastian Holtermann2019-08-1762-206/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces invocations of - `cmSystemTools::IsInternallyOn` with `cmIsInternallyOn` - `cmSystemTools::IsNOTFOUND` with `cmIsNOTFOUND` - `cmSystemTools::IsOn` with `cmIsOn` - `cmSystemTools::IsOff` with `cmIsOff`
| * | | | cmStringAlgorithms: Add cmIsInternallyOn, cmIsNOTFOUND, cmIsOn, cmIsOffSebastian Holtermann2019-08-172-0/+124
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the following functions to cmStringAlgorithms: - `cmIsInternallyOn` - `cmIsNOTFOUND` - `cmIsOn` - `cmIsOff` The implementations were copied from the equivalent functions in cmSystemTools.
* | | | Merge topic 'solaris_clang'Brad King2019-08-193-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47937219ee Solaris: Add support for Clang compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3672
| * | | | Solaris: Add support for Clang compilerLibor Bukata2019-08-093-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Rainer Orth Fixes: #19456
* | | | | Merge branch 'release-3.15'Brad King2019-08-190-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'msvc-runtime-library-flang' into release-3.15Brad King2019-08-092-4/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3674
* | \ \ \ \ \ Merge topic 'msvc-runtime-library-flang'Brad King2019-08-192-4/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea0294c281 Flang: Implement MSVC runtime library abstraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3674
| * | | | | | Flang: Implement MSVC runtime library abstractionBrad King2019-08-092-4/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags for Flang on Windows. Add them now and update the MSVCRuntimeLibrary Fortran test to work with Flang. Base the flags on those we already use for the GNU-like Clang targeting the MSVC ABI. Fixes: #19583
* | | | | | Merge topic 'swift-import-library-location'Kyle Edwards2019-08-191-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5480f65ab1 Swift: honour `IMPLIB_LOCATION` property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3686
| * | | | | | Swift: honour `IMPLIB_LOCATION` propertySaleem Abdulrasool2019-08-121-2/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules did not account for the import library location (through `<TARGET_IMPLB>`) and instead would always write the import library to the default location (next to the shared library/executable). This prevented the use of `CMAKE_RUNTIME_OUTPUT_LOCATION` and `CMAKE_ARCHIVE_OUTPUT_LOCATION`.
* | | | | | CMake Nightly Date StampKitware Robot2019-08-191-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2019-08-181-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2019-08-171-1/+1
| | | |
* | | | Merge topic 'clang-llvm-rc'Kyle Edwards2019-08-161-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cea253a38b Clang: Fall back to llvm-rc when rc is unavailable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3687
| * | | | Clang: Fall back to llvm-rc when rc is unavailableGregory Mitrano2019-08-141-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change modifies how CMAKE_RC_COMPILER is configured to improve the out-of-box experience for developers using Clang on Windows. The previous behavior was to require the user to explicitly specify the resource compiler when CMake was called. The new behavior is to automatically attempt to locate the MSVC rc binary and use that if it's found. If rc is not available, CMake will now fall back to Clang's llvm-rc binary. With this change in place, trivial C/C++ programs can be generated with Ninja and Clang on Windows without running into errors about a missing resource compiler. Fixes: #19318
* | | | | Merge topic 'cmExpandList'Kyle Edwards2019-08-1693-508/+492
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f6495e24e cmSystemTools: Remove ExpandListArgument methods f4f3c68926 Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument ff42dec891 cmStringAlgorithms: Add cmExpandList functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3682
| * | | | | cmSystemTools: Remove ExpandListArgument methodsSebastian Holtermann2019-08-142-116/+0
| | | | | |
| * | | | | Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgumentSebastian Holtermann2019-08-1490-394/+381
| | | | | |
| * | | | | cmStringAlgorithms: Add cmExpandList functionsSebastian Holtermann2019-08-142-0/+113
| | | | | |
* | | | | | Merge topic 'cmStringAlgorithms_ulong'Kyle Edwards2019-08-1620-74/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 935fbe0b04 cmStringAlgorithms: Add cmStrToLong and cmStrToULong Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3681
| * | | | | | cmStringAlgorithms: Add cmStrToLong and cmStrToULongSebastian Holtermann2019-08-1020-74/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the following functions to cmStringAlgorithms: - `cmStrToLong`: moved from `cmSystemTools::StringToLong` - `cmStrToULong`: moved from `cmSystemTools::StringToULong` Overloads of the given functions for `std::string` are added as well.
* | | | | | | CMake Nightly Date StampKitware Robot2019-08-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-08-151-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-08-141-1/+1
| | | | | |
* | | | | | Merge topic 'retry-directory-delete'Kyle Edwards2019-08-132-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bc77966ad Retry removing directories on Windows 5729580376 Use registry setting for removal retry count and delay Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3667
| * | | | | | Retry removing directories on WindowsKasper Laudrup2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows removing a directory can fail if other processes have a handle to it. This has been "solved" with a retry hack when moving directories, so use the same hack when removing directories.
| * | | | | | Use registry setting for removal retry count and delayKasper Laudrup2019-08-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of hardcoding the amount of retries and the time to sleep between them when removing directories on Windows, use the setting potentially present in the registry instead. This setting is already used when retrying moving directories.
* | | | | | | Merge topic 'per-language-link-library-flag'Kyle Edwards2019-08-135-2/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 689be6235e Generator: support per-language link library flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3668
| * | | | | | | Generator: support per-language link library flagSaleem Abdulrasool2019-08-095-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the use of MSVC and Swift on Windows in a single project. MSVC uses no flag to indicate linked libraries while Swift uses `-l`. Add support for a language specific link library flag which takes precedence over the global `CMAKE_LINK_LIBRARY_FLAG` which preserves compatibility with earlier releases.
* | | | | | | | Merge topic 'support_CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS'Kyle Edwards2019-08-135-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f1d22c2d9 CUDA: Support CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS global variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3636
| * | | | | | | | CUDA: Support CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS global variableRobert Maynard2019-08-065-1/+15
| | | | | | | | |
* | | | | | | | | Merge topic 'cuda_separable_compilation_determined_by_compiler_id'Kyle Edwards2019-08-134-7/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a233e4e7d9 CUDA: Compilers can now state they don't require a device linking step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3659
| * | | | | | | | | CUDA: Compilers can now state they don't require a device linking stepRobert Maynard2019-08-064-7/+18
| | | | | | | | | |
* | | | | | | | | | Merge topic 'free-command-a'Kyle Edwards2019-08-1325-594/+257
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ba0bf60c6 cmA*Command: Turn into free functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3660
| * | | | | | | | | | cmA*Command: Turn into free functionsRegina Pfeifer2019-08-0725-594/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref: #19499
* | | | | | | | | | | Merge topic 'strcat-localgenerator'Kyle Edwards2019-08-131-92/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62659100aa cmLocalGenerator: Use cmStrCat Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Merge-request: !3671
| * | | | | | | | | | | cmLocalGenerator: Use cmStrCatRegina Pfeifer2019-08-091-92/+48
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grep for '[A-Z]_";' to find places that could benefit from cmStrCat.
* | | | | | | | | | | Merge topic 'cmRemoveQuotes'Kyle Edwards2019-08-135-16/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27090096ef cmStringAlgorithms: Add cmRemoveQuotes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3665
| * | | | | | | | | | | cmStringAlgorithms: Add cmRemoveQuotesSebastian Holtermann2019-08-095-16/+40
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `cmRemoveQuotes` function to cmStringAlgorithms - Remove unused removeQuotes inline functions
* | | | | | | | | | | Merge topic 'cmake-bootstrap-def'Kyle Edwards2019-08-1340-143/+140
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4d5053c30 Refactor: Finish replacing CMAKE_BUILD_WITH_CMAKE with CMAKE_BOOTSTRAP fe921edd49 Utilities/Scripts: Remove temporary CMAKE_BOOTSTRAP conversion script 54e9d38c28 Refactor: Convert all instances of CMAKE_BUILD_WITH_CMAKE to CMAKE_BOOTSTRAP ad0e44a18b Utilities/Scripts: Add temporary CMAKE_BOOTSTRAP conversion script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3662
| * | | | | | | | | | | Refactor: Finish replacing CMAKE_BUILD_WITH_CMAKE with CMAKE_BOOTSTRAPKyle Edwards2019-08-092-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove -DCMAKE_BUILD_WITH_CMAKE from Source/CMakeLists.txt. Remove CMAKE_BOOTSTRAP from bootstrap's cmConfigure.h. Add -DCMAKE_BOOTSTRAP to all bootstrap sources, and remove the Unix specialization of CMAKE_BOOTSTRAP in libuv (a review of the libuv code suggests that this will not have an effect on the Windows build.)
generated by cgit v0.12 at 2025-08-25 17:06:24 (GMT)