summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindHDF5-c-version'Brad King2017-11-091-1/+1
|\ | | | | | | | | | | | | a6abb6c8 FindHDF5: Fix H5_VERSION on Patch in C Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1465
| * FindHDF5: Fix H5_VERSION on Patch in CAxel Huebl2017-11-081-1/+1
| | | | | | | | | | | | | | | | Fix a typo from commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-04) that accidentally used the HDF5 C++ version (which could be empty) while detecting the C patch version. The detection failed for patch releases, such as `1.10.0-patch1` becoming `.1` instead of `1.10.0.1`.
* | Merge topic 'cmake-default-dir-install-permissions'Brad King2017-11-0921-62/+315
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e896029 CPack: enable setting default dir creation permissions a4c82916 CPack test: expand output checking fallback 670ad047 Move file/dir permissions code to common file. deeba85f CMake: enable setting default dir creation permissions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1433
| * | CPack: enable setting default dir creation permissionsDomen Vrankar2017-11-0812-12/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces CPACK_DEFAULT_DIRECTORY_INSTALL_PERMISSIONS variable which adds support for functionality introduced by CMAKE_DEFAULT_DIRECTORY_INSTALL_PERMISSIONS variable. Fixes #17333 # Conflicts: # Help/release/dev/cmake-default-dir-install-permissions.rst
| * | CPack test: expand output checking fallbackDomen Vrankar2017-11-082-0/+3
| | | | | | | | | | | | | | | Some tests can have the same output for a certain subtest no matter which packaging generator is used.
| * | Move file/dir permissions code to common file.Domen Vrankar2017-11-085-49/+85
| | |
| * | CMake: enable setting default dir creation permissionsDomen Vrankar2017-11-085-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces CMAKE_DEFAULT_DIRECTORY_INSTALL_PERMISSIONS variable which enables the user to specify the default permissions for directory creation. This setting is then used to auto set the permissions on directories which are implicitly created by install() and file(INSTALL) commands such as CMAKE_INSTALL_PREFIX directories.
* | | Merge topic 'fortran-flags-docstring'Brad King2017-11-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 27b62fa4 Fortran: Use same DOC for flags as other languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1463
| * | | Fortran: Use same DOC for flags as other languagesChristian Pfeiffer2017-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | Currently, only Fortran uses the string "Flags for Fortran compiler", whereas C, CXX, CUDA all use the same, more descriptive string.
* | | | Merge topic 'contract-plplot'Brad King2017-11-093-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05e9f6ec Tests: Add contract test for PLplot Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1452
| * | | | Tests: Add contract test for PLplotBrad King2017-11-083-0/+23
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2017-11-091-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'imported-promotion'Brad King2017-11-0814-2/+248
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a3922be Add new target-property `IMPORTED_GLOBAL`. 854e482a cmTarget: Simplified and fixed a string-comparision. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1254
| * | | | Add new target-property `IMPORTED_GLOBAL`.Deniz Bahadir2017-11-0714-1/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this new `IMPORTED_GLOBAL` target-property is to prolong the lifetime and scope of `IMPORTED` targets in such a way as if they had been created with the keyword `GLOBAL` in the first place. * It can only be set to `TRUE`. That means, a local `IMPORTED` target can be promoted to global scope but a global `IMPORTED` target cannot be degraded to local scope! * Setting it to `TRUE` only succeeds if done from within the same directory in which the `IMPORTED` target was created in the first place. Fixes #17256.
| * | | | cmTarget: Simplified and fixed a string-comparision.Deniz Bahadir2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, `cmTarget::CheckProperty` accepted several strings as valid properties, including all strings prefixed with "INTERFACE_LINK_LIBRARIES". Now, that particular string is still accepted but other strings prefixed with that string are no longer accepted.
* | | | | Merge topic 'update-kwsys'Brad King2017-11-089-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 517cfe0b Merge branch 'upstream-KWSys' into update-kwsys dc059ae7 KWSys 2017-11-07 (5249a82d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1458
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-11-079-15/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-11-07 (5249a82d)
| | * | | | | KWSys 2017-11-07 (5249a82d)KWSys Upstream2017-11-079-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5249a82d5e617a29659e5881d0df65acb3220eab (master). Upstream Shortlog ----------------- Brad King (1): bfdbfe9b Avoid requiring CMake 3.4 string(APPEND) luzpaz (1): 9a1d5901 Fix trivial typos in text
* | | | | | | Merge topic 'flang-windows'Brad King2017-11-083-22/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c368228 Flang: Add support for compiling sources on Windows 72d27964 Flang: Identify as simulating MSVC on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1430
| * | | | | | | Flang: Add support for compiling sources on WindowsIsuru Fernando2017-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define `CMAKE_Fortran_COMPILE_OBJECT` for Flang on Windows.
| * | | | | | | Flang: Identify as simulating MSVC on WindowsIsuru Fernando2017-10-312-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `CMakeFortranCompilerId.F.in`, take the `_MSC_VER` out of the Intel-specific block so it will trigger for other compilers like Flang. In `Compiler/Clang.cmake`, switch off Fortran too.
* | | | | | | | Merge branch 'release-3.10'Brad King2017-11-080-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'implicit-lib-gcceh' into release-3.10Brad King2017-11-082-2/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1460
| * \ \ \ \ \ \ \ \ Merge branch 'FindOpenGL-clarify-libraries' into release-3.10Brad King2017-11-071-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1459
| * \ \ \ \ \ \ \ \ \ Merge branch 'csharp-version-english' into release-3.10Brad King2017-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1449
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'irsl-win2018' into release-3.10Brad King2017-11-061-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1451
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.9'Brad King2017-11-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'implicit-lib-gcceh' into release-3.9Brad King2017-11-082-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1460
* | | | | | | | | | | | | | Merge topic 'irsl-win2018'Brad King2017-11-081-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6994f43 IRSL: Add support for the 2018 release on Windows. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1451
| * | | | | | | | | | | | | IRSL: Add support for the 2018 release on Windows.Christian Pfeiffer2017-11-061-3/+5
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17421
* | | | | | | | | | | | | Merge topic 'FindOpenGL-clarify-libraries'Brad King2017-11-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f44fb2dd FindOpenGL: Clarify logic constructing OPENGL_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1459
| * | | | | | | | | | | | FindOpenGL: Clarify logic constructing OPENGL_LIBRARIESBrad King2017-11-071-1/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our comment says the logic matches that for OpenGL::GL. Structure the logic the same way to make this clearer. Issue: #17437
* | | | | | | | | | | | Merge topic 'implicit-lib-gcceh'Brad King2017-11-082-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41aacca7 Restore exclusion of "gcc_eh" from implicit link libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1460
| * | | | | | | | | | Restore exclusion of "gcc_eh" from implicit link librariesChristian Pfeiffer2017-11-082-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~148^2 (Do not assume GCC libs are linked by all compilers, 2017-05-05) we no longer filter out all `gcc*` implicit link libraries. This allows mixing of gcc and non-gcc compilers across languages. However, this caused a subtle problem with how GCC makes exception handling symbols available to linked binaries. GCC (at least on MinGW) provides two different libraries with exception handling symbols: * gcc_s: A shared library with -fvisibility=default, used by -shared-libgcc. * gcc_eh: A static library with -fvisibility=hidden, used by -static-libgcc. The C compiler (on MinGW) defaults to -static-libgcc and uses gcc_eh. The C++ compiler defaults to -shared-libgcc and uses gcc_s when linking shared libraries and executables so that exceptions can propagate across shared libraries [1]. When linking a mixed-language binary, the C++ compiler should be used along with its choice of gcc_s. In this case gcc_eh should not be added even though the C compiler implies it because gcc_s supersedes it. Since the above-mentioned change, CMake is adding gcc_eh to C++ link lines that also contain C code on MinGW. This causes both gcc_s and gcc_eh to be used, which is incorrect. We can fix this simply by excluding gcc_eh from the C compiler's implicit link libraries. [1] https://gcc.gnu.org/onlinedocs/gcc-7.2.0/gcc/Link-Options.html#Link-Options Fixes: #17436
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'csharp-version-english'Brad King2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04937db1 CSharp: Fix compiler version detection in non-English languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1449
| * | | | | | | | | | CSharp: Fix compiler version detection in non-English languagesYoshinori Tahara2017-11-071-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we run `csc.exe /help` we look for "Version" in the output. Explicitly ask for the output in English. Reported-by: guttally@users.noreply.github.com
* | | | | | | | | | Merge topic 'update-CheckFortran'Brad King2017-11-071-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e2193a2 Tests: Avoid hanging on check for Fortran e673e6f0 Tests: Pass generator instance into check for Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1454
| * | | | | | | | | | Tests: Avoid hanging on check for FortranBrad King2017-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a timeout when running the check for Fortran in case the tools hang.
| * | | | | | | | | | Tests: Pass generator instance into check for FortranBrad King2017-11-061-0/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for a Fortran compiler using the same VS instance that we are testing.
* | | | | | | | | | Merge topic 'findboost-compiler-version'Brad King2017-11-071-7/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d70bdc72 FindBoost: support more than one number in version components 335816ef FindBoost: use CMake's compiler version rather than querying again Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1441
| * | | | | | | | | | FindBoost: support more than one number in version componentsBen Boeckel2017-11-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | FindBoost: use CMake's compiler version rather than querying againBen Boeckel2017-11-031-6/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'server-test-info'Brad King2017-11-077-4/+263
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35a52bd1 server: add "ctestInfo" request to get test info Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1414
| * | | | | | | | | | server: add "ctestInfo" request to get test infoJustin Goshi2017-11-037-4/+263
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-071-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'typos'Brad King2017-11-0668-83/+83
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 777e87ae Fix trivial typos in text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1442
| * | | | | | | | | | Fix trivial typos in textluzpaz2017-11-0368-83/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces
* | | | | | | | | | | Merge topic 'test-contract-refactor'Brad King2017-11-0610-288/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c626b7e Tests: Refactor contract test activation 4bd5af63 Tests: Factor out contract test HOME finding 0ce082b7 Tests: Drop unused contract test environment script 36346de4 Tests: Drop unused contract test bbc9c966 Tests: Honor already-set CTEST_REAL_HOME in case of repeat run Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1444
| * | | | | | | | | | | Tests: Refactor contract test activationBrad King2017-11-033-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use separate `CMake_TEST_CONTRACT_<project>` variables for each test. Make the set of possible tests match what is in the source tree.