summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cuda: Extend toolset argument to accept pathBenjamin Wozniak2019-08-272-2/+61
| | | | | | | | Previously cuda could only be used with cmake if it is installed globally on the system. Sometimes this is not possible (eg docker, packaging with conan, etc.). Thus the cuda toolset argument is extended to take a path to a cuda install directory.
* CMake Nightly Date StampKitware Robot2019-08-211-1/+1
|
* Merge topic 'bash-completion-silent-D-lookup'Brad King2019-08-201-2/+2
|\ | | | | | | | | | | | | 64aeb520ca bash-completion: silent cmake -D lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3692
| * bash-completion: silent cmake -D lookupFelix Schwitzer2019-08-161-2/+2
| | | | | | | | | | The completion for -D tries to read the cache via 'cmake -LA -N', but this prints a warning. Silent the lookup by redirecting this warning to null.
* | Merge topic 'ctest_coverage_help_typo'Craig Scott2019-08-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | ccefe9798d Help: Fix typo in ctest_coverage synopsis Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3706
| * | Help: Fix typo in ctest_coverage synopsisSylvain Joubert2019-08-201-1/+1
| | |
* | | Merge topic 'trace-redirect'Brad King2019-08-2013-1/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3c94069660 Add --trace-redirect parameter to redirect trace output to a file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3645
| * | | Add --trace-redirect parameter to redirect trace output to a fileIgor Ivanov2019-08-1013-1/+68
| | | |
* | | | Merge topic 'cmake-tutorial'Brad King2019-08-2059-507/+461
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f6a32a0f6 Tutorial: Improve Step 9 6a35d630dc Tutorial: Improve Step 8 61d4d990d6 Tutorial: Improve Step 7 a36731c634 Tutorial: Improve Step 6 df9cdf629c Tutorial: Improve Step 5 442c0f0d46 Tutorial: Improve Step 4 bc64401c3d Tutorial: Improve Step 3 49ce4d6ff4 Tutorial: Improve Step 2 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3528
| * | | | Tutorial: Improve Step 9Betsy McPhail2019-08-1911-20/+22
| | | | | | | | | | | | | | | | | | | | * Move USE_MYMATH from configured header to target_compile_definitions
| * | | | Tutorial: Improve Step 8Betsy McPhail2019-08-197-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | * Remove comments from CTestConfig.cmake * Update directions
| * | | | Tutorial: Improve Step 7Betsy McPhail2019-08-192-8/+17
| | | | | | | | | | | | | | | | | | | | * Update directions
| * | | | Tutorial: Improve Step 6Betsy McPhail2019-08-1915-145/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Print message when using the table * Remove duplicated comment * Remove HAVE_LOG and HAVE_EXP checks, use generated table instead
| * | | | Tutorial: Improve Step 5Betsy McPhail2019-08-1923-98/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated output message * Use 'target_compile_definitions' for HAVE_LOG and HAVE_EXP Previously, the change from using TutorialConfig.h to target_compile_definitions happened without explanation as part of Step 8.
| * | | | Tutorial: Improve Step 4Betsy McPhail2019-08-191-14/+22
| | | | | | | | | | | | | | | | | | | | * Clarify directions
| * | | | Tutorial: Improve Step 3Betsy McPhail2019-08-195-18/+31
| | | | | | | | | | | | | | | | | | | | * Move `option(USE_MYMATH...` to the same location in all CMakeLists files
| * | | | Tutorial: Improve Step 2Betsy McPhail2019-08-1918-50/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix typo in #include * Remove CMakeLists file that users should create * Clarify which files users are expected to create * Highlight the importance of configuring TutorialConfig.h.in after the MY_MATH option has been set
| * | | | Tutorial: Improve Step 1Betsy McPhail2019-08-1930-207/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update minimum required version to 3.10 * Use VERSION argument to project command rather than separate variables * Replace `endif(USE_MYMATH)` with more modern `endif()` * Simplify the call to 'configure_file()' * Add comments to tutorial.cxx to use as anchors in documentation * Remove CMakeLists and TutorialConfig.h.in files that users should create. Consequently, remove Step1 from CMake tests.
* | | | | Merge topic 'find_openacc_targets'Brad King2019-08-209-3/+183
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4fc0667ae FindOpenACC: Provide import targets and OpenACC_<lang>_OPTIONS variable 9460501ad7 FindOpenACC: Provide a Fortran snippet that compiles with gfortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3670
| * | | | | FindOpenACC: Provide import targets and OpenACC_<lang>_OPTIONS variableRobert Maynard2019-08-199-0/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the FindOpenACC module had issues where the contents of OpenACC_<lang>_FLAGS could not be used with target_compile_options when it contained multiple compiler flags.
| * | | | | FindOpenACC: Provide a Fortran snippet that compiles with gfortranRobert Maynard2019-08-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original Fortran snippet would fail to compile with the error message of: ``` return 0; 1 Error: Alternate RETURN statement at (1) is only allowed within a SUBROUTINE ``` We solve this by removing the early termination logic.
* | | | | | Merge topic 'help-full'Brad King2019-08-202-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d56a4b16ca Help: Restore installation of top-level index Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3701
| * | | | | | Help: Restore installation of top-level indexBrad King2019-08-192-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed installation of `Help/index.rst` in commit d2fde94809 (Help: Add infrastructure for guide-level documentation, 2019-05-30), but the file is required for `--help-full` to work. Restore installation of the file and update it to avoid referencing the `Help/guide` directory in its toctree during processing by `cmRST`.
* | | | | | | Merge branch 'release-3.15'Brad King2019-08-200-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ccmake-crash-on-empty-strings-property' into release-3.15Brad King2019-08-201-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3678
* | \ \ \ \ \ \ \ Merge topic 'ccmake-crash-on-empty-strings-property'Brad King2019-08-201-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 154c5f7949 ccmake: handle cache entries with empty STRINGS property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3678
| * | | | | | | ccmake: handle cache entries with empty STRINGS propertyM Furkan USLU2019-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19585
* | | | | | | | CMake Nightly Date StampKitware Robot2019-08-201-1/+1
| | | | | | | |
* | | | | | | | 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