summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'install-fail-reason'Brad King2019-08-211-8/+13
|\ | | | | | | | | | | | | | | 891e670e59 install: print reason of failure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !3696
| * install: print reason of failureJon Chronopoulos2019-08-171-8/+13
| | | | | | | | Fixes: #19430
* | Merge topic 'ccmake-find-system-form-header'Brad King2019-08-211-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 66654135c1 ccmake: Fix form.h include with CMAKE_USE_SYSTEM_FORM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3683
| * | ccmake: Fix form.h include with CMAKE_USE_SYSTEM_FORMChristoph GrĂ¼ninger2019-08-201-0/+4
| | | | | | | | | | | | | | | | | | | | | Some distributions have form.h in ncurses/ next to the ncurses.h found by FindCurses. Fixes: #19589
* | | Merge topic 'vs-sln-bom'Brad King2019-08-211-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3b51343ea1 VS: Emit UTF-8 BOM for generated solution files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3705
| * | | VS: Emit UTF-8 BOM for generated solution filesJustin Goshi2019-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We write UTF-8-encoded content to the `.sln` files, so tell VS to read them as such. Fixes: #19594
* | | | Merge topic 'cm-contains'Brad King2019-08-2130-174/+140
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dfc52675c cmAlgorithms: Add cmContains Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !3700
| * | | | cmAlgorithms: Add cmContainsRegina Pfeifer2019-08-1930-174/+140
| |/ / / | | | | | | | | | | | | Also, use the new function where applicable.
* | | | Merge topic 'ProcessorCount-solaris'Brad King2019-08-211-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c87bc60ee ProcessorCount: Fix virtual processor count on Solaris Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3694
| * | | | ProcessorCount: Fix virtual processor count on SolarisJon Chronopoulos2019-08-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code did not count the number of virtual processors across physical processors on SunOS. Can handle the following situations: ``` $ uname -a SunOS solaris 5.11 11.4.0.15.0 i86pc i386 i86pc $ psrinfo -p -v The physical processor has 1 virtual processor (0) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (1) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (2) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (3) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) ``` ``` $ uname -a SunOS sol11x86 5.11 11.0 i86pc i386 i86pc $ psrinfo -p -v The physical processor has 2 virtual processors (0 1) x86 (GenuineIntel 50650 family 6 model 85 step 0 clock 2000 MHz) Intel(r) Xeon(r) Gold 6138 CPU @ 2.00GHz ``` ``` $ uname -a SunOS sol11 5.11 11.0 sun4v sparc sun4v $ psrinfo -p -v The physical processor has 2 cores and 16 virtual processors (0-15) The core has 8 virtual processors (0-7) The core has 8 virtual processors (8-15) SPARC-T4 (chipid 0, clock 2848 MHz) ```
* | | | | Merge topic 'FindCUDA-nvcc-include-dir-backslash'Brad King2019-08-211-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76b76a7f9b FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3679
| * | | | | 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 'free-disallowed'Brad King2019-08-215-34/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c55fb044a9 cmBuildNameCommand: Implement as free function 86bf1eef75 cmState: Support free function disallowed commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3688
| * | | | | | cmBuildNameCommand: Implement as free functionRegina Pfeifer2019-08-164-28/+16
| | | | | | |
| * | | | | | cmState: Support free function disallowed commandsRegina Pfeifer2019-08-132-6/+43
| | | | | | |
* | | | | | | Merge branch 'release-3.15'Brad King2019-08-210-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindMPI-restore-flag-vars' into release-3.15Brad King2019-08-211-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3710
* | \ \ \ \ \ \ \ Merge topic 'FindMPI-restore-flag-vars'Brad King2019-08-211-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31b8b28fed FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3710
| * | | | | | | | FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONSRobert Maynard2019-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the compile flags but accidentally inverted the arguments to `list(JOIN)` causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS` to be empty. Issue: #18349
* | | | | | | | | 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.