summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-271-2/+0
| |\ \ | | | | | | | | | | | | | | | | This has no corresponding merge-request because the branch was made as a direct fixup specific to 3.9.
| | * | FindBoost: Finish reverting "Simplify search in lists" for 3.9Brad King2017-09-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.", 2017-09-05) we forgot to also revert commit commit v3.9.1~15^2 (FindBoost: pop policy stack before returning, 2017-07-24) which had been made as a fixup to the original commit. Fixes: #17309
| * | | FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9Roger Leigh2017-09-181-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65 dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version 1.65.1, 2017-09-06) to CMake 3.9. Fixes: #17289
| * | | Merge branch 'backport-irsl-vs15-future' into release-3.9Brad King2017-09-061-19/+16
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1240
| * \ \ \ Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-051-9/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !1238
| * | | | Merge branch 'android-ndk-r16' into release-3.9Brad King2017-09-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1237
| * \ \ \ \ Merge branch 'csharp_fix_initial_flags' into release-3.9Brad King2017-09-051-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1232
| * \ \ \ \ \ Merge branch 'findopenmp-found' into release-3.9Brad King2017-09-051-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1233
| * \ \ \ \ \ \ Merge branch 'ninja-cl-intl' into release-3.9Brad King2017-08-231-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1179
* | \ \ \ \ \ \ \ 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 '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 'typos'Brad King2017-11-0628-37/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 777e87ae Fix trivial typos in text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1442
| * | | | | | | | | | Fix trivial typos in textluzpaz2017-11-0328-37/+37
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | FindBZip2: Normalize slashes when legacy BZIP2_LIBRARIES is specifiedMark Salisbury2017-11-011-0/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows if you specify the library path using a regular Windows path with backslashes, FindBZip2 announces that it found the library, but the value is reported with backslashes instead of forward slashes. This breaks assumptions elsewhere in CMake. Convert slashes explicitly.
* | | | | | | | | Merge topic 'mingw-clang-c-compile-features'Brad King2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f86879a0 Record C compile features flags for MinGW Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1435
| * | | | | | | | | Record C compile features flags for MinGW Clang on WindowsBrad King2017-11-011-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features for MinGW Clang on Windows, 2016-01-11). Make the same change for C. The `UNIX` condition on Clang C compiler features was already dropped by refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10). Our documentation already claims support for this combination. This was simply an oversight when support was added for MinGW Clang C++. Issue: #15897 Issue: #15943
* | | | | | | | | Merge topic 'freetype-windows'Brad King2017-10-301-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d42c3ed FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1416
| * | | | | | | | | FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specifiedMark Salisbury2017-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows if you specify the library path using a regular Windows path with backslashes, FindFreetype announces that it found the library, but the value is reported with backslashes instead of forward slashes. This breaks assumptions elsewhere in CMake. Convert slashes explicitly since we have no `find_library` call for `FREETYPE_LIBRARY`.
* | | | | | | | | | CPack/Deb: handle shlibs file generation when SOVERSION set to 0Domen Vrankar2017-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS did not auto generate shlibs control file when .so version of the library was set to 0. Fixes #17318
* | | | | | | | | | Merge topic 'findICU_update'Brad King2017-10-271-1/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20696a53 FindICU: Add support for static libraries on Windows 606ece67 FindICU: Search in 'sbin' directories for icu tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1396
| * | | | | | | | | FindICU: Add support for static libraries on WindowsFrancois Budin2017-10-251-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling ICU statically on Windows with Visual Studio, the library file names are prefixed with 's' [1]. [1] http://source.icu-project.org/repos/icu/trunk/icu4c/source/icudefs.mk.in `STATIC_PREFIX_WHEN_USED = s`
| * | | | | | | | | FindICU: Search in 'sbin' directories for icu toolsFrancois Budin2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Ubuntu, several binaries that FindICU.cmake searches for are installed in 'sbin' instead of 'bin' [1]. [1] https://packages.ubuntu.com/xenial/amd64/icu-devtools/filelist
* | | | | | | | | | Merge topic 'clang-cl-TP'Brad King2017-10-262-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7077a554 Clang: Use -TP flag for C++ sources with clang-cl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1407
| * | | | | | | | | | Clang: Use -TP flag for C++ sources with clang-clBrad King2017-10-252-0/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this for `cl`, so we should do it for `clang-cl`. Fixes: #17394
* | | | | | | | | | Merge topic 'flang-windows'Brad King2017-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2c6c357 Flang: Add partial support on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1404
| * | | | | | | | | | Flang: Add partial support on WindowsIsuru Fernando2017-10-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add minimal changes needed to help Flang itself build on Windows using CMake. Additional work will be required for full support. Issue: #17384
* | | | | | | | | | | Merge topic 'omp-oacc-werror-return-type'Brad King2017-10-252-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15da0ba3 Find{OpenMP,OpenACC}: Fix detection with -Werror=return-type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1406
| * | | | | | | | | | | Find{OpenMP,OpenACC}: Fix detection with -Werror=return-typeChristian Pfeiffer2017-10-242-3/+11
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly return a value from `main` in our test sources. Fixes: #17391
* | | | | | | | | | | Merge topic 'findmpi-core-count'Brad King2017-10-251-7/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1610f757 FindMPI: Use physical cores for MPIEXEC_MAX_NUMPROCS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1405
| * | | | | | | | | | | FindMPI: Use physical cores for MPIEXEC_MAX_NUMPROCSChristian Pfeiffer2017-10-241-7/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~224^2~1 (FindMPI: MPIEXEC handling improvements, 2017-04-21) the `ProcessorCount` module is being used to initialize `MPIEXEC_MAX_NUMPROCS`. However, this leads to the logical cores being counted rather than the physical ones, and some MPI implementations like OpenMPI will error if mpiexec is called with that number. Switch it to the number of physical cores using `cmake_host_system_information`. This ensures that if `MPIEXEC_MAX_NUMPROCS` is being used to set up MPI tests with CTest or similar that the tests won't spuriously fail due to OpenMPI refusing to start the application.
* | | | | | | | | | | Merge topic 'FindCUDA-doc-format'Brad King2017-10-241-18/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17ddf126 FindCUDA: Improve documentation formatting markup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1403
| * | | | | | | | | | | FindCUDA: Improve documentation formatting markupHenry Schreiner2017-10-231-18/+19
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'FindOpenCL-more-versions'Brad King2017-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55f7930f FindOpenCL: Add detection of OpenCL 2.1 and 2.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1398
| * | | | | | | | | | | FindOpenCL: Add detection of OpenCL 2.1 and 2.2Henry Schreiner2017-10-231-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'gnuid-cmp54-fix'Brad King2017-10-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8be8b1b GNUInstallDirs: Enable CMP0054 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1400
| * | | | | | | | | | | GNUInstallDirs: Enable CMP0054Christian Pfeiffer2017-10-231-0/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17381
* | | | | | | | | | | Merge topic 'generator-instance'Brad King2017-10-242-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ffb3538 VS: Select and save a VS 2017 instance persistently 17edfa41 cmVSSetupHelper: Add option to specify an instance a19b8113 CheckLanguage: Pass generator instance into check 6b3cd64d ExternalProject: Propagate the generator instance 314613d1 Add infrastructure for generators to select a build tool instance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1394
| * | | | | | | | | | CheckLanguage: Pass generator instance into checkBrad King2017-10-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we do not check for support for the language with the same generator instance as the caller.
| * | | | | | | | | | ExternalProject: Propagate the generator instanceBrad King2017-10-191-0/+15
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `CMAKE_GENERATOR` option is given to `ExternalProject_Add`, look also for option `CMAKE_GENERATOR_INSTANCE` to pass on to cmake as a cache definition. When no `CMAKE_GENERATOR` option is given explicitly then use the current project's `CMAKE_GENERATOR_INSTANCE` (since we already use its CMAKE_GENERATOR).
* | | | | | | | | | Merge topic 'flang-remove-boundscheck'Brad King2017-10-231-2/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3aeff21d Flang: Remove unsupported fbounds-check flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1393
| * | | | | | | | | Flang: Remove unsupported fbounds-check flagChristian Pfeiffer2017-10-191-2/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Flang compiler neither supports nor documents -fbounds-check leading to -Wunused-command-line-argument warnings with the default Debug flags.