summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindPostgreSQL: Add support for PG10Egor Pugin2018-01-091-2/+2
|
* Merge branch 'irsl-msvc-omp-fix' into release-3.10Brad King2017-12-121-2/+7
|\ | | | | | | Merge-request: !1588
| * IRSL: Fix MSVC variable deferencingChristian Pfeiffer2017-12-121-2/+7
| | | | | | | | Fixes: #17529
* | Merge branch 'findmpi-builtin-fix' into release-3.10Brad King2017-12-121-121/+168
|\ \ | |/ |/| | | Merge-request: !1569
| * FindMPI: Fix various legacy problemsChristian Pfeiffer2017-12-121-121/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR fixes a number of bugs stemming from legacy variable handling, partially introduced by commit v3.10.0-rc1~103^2 (FindMPI: Add support for FreeBSD and SLES, 2017-08-09). * `MPI_COMPILE_OPTIONS` and `MPI_COMPILE_DEFINITIONS` legacy hints were not passed correctly. * Legacy variables could be parsed after they were set by `FindMPI` cause erroneous hinting on subsequent runs. * In the case of the compiler supporting MPI implicitly: * not all consumption variables would be correctly reset. * `MPI_<LANG>_HEADER_DIR` would be set unintentionally. * `MPI_<LANG>_LIB_NAMES` appeared in cache despite being ignored. * on subsequent passes, `MPI_<LANG>_COMPILER` could be corrupted. * the C-to-CXX copy logic would take place even if `MPI_SKIP_GUESSING` was turned on * if only some language compilers were given, inconsistent search behavior could be observed Issue: #17538
* | Merge branch 'fix-iar-binutils-for-cxx' into release-3.10Brad King2017-12-121-2/+2
|\ \ | | | | | | | | | Merge-request: !1572
| * | IAR: FindBinUtils should work for CXX as well as CIslam Amer2017-12-121-2/+2
| | | | | | | | | | | | | | | | | | The IAR compiler test works when a project specifies LANGUAGES C CXX but fails if CXX comes before C. This change makes it work regardless of the order.
* | | Merge branch 'cuda_darwin_proper_install_names_flags' into release-3.10Brad King2017-12-081-0/+19
|\ \ \ | |_|/ |/| | | | | Merge-request: !1570
| * | CUDA: Shared libraries on Darwin properly setup @rpath install_namesRobert Maynard2017-12-071-0/+19
| |/ | | | | | | | | | | Shared libraries linked with CUDA now properly setup booth the correct install_name but also specify headerpad_max_install_names so that the names can be changed post build.
* | Merge branch 'gtest-discovery-timeout' into release-3.10Brad King2017-12-072-4/+21
|\ \ | | | | | | | | | Merge-request: !1534
| * | GoogleTest: Add timeout to discoveryMatthew Woehlke2017-12-062-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a TIMEOUT option to gtest_discover_tests. This provides a work-around in case a test goes out to lunch, rather than causing the build to simply hang. (Although this is still a problem with the user's project, hanging the build is not cool, especially in the case of automatically running CI builds. It is much preferred that the build should actively fail in this case, and it is trivially easy for us to implement that.)
| * | GoogleTest: Improve gtest_discover_tests messagesMatthew Woehlke2017-11-301-3/+7
| | | | | | | | | | | | | | | Adjust the formatting of error messages produced when test discovery goes wrong, in order to avoid spurious line breaking.
* | | Merge branch 'findmpi-notfound-spam' into release-3.10Brad King2017-12-051-10/+16
|\ \ \ | | | | | | | | | | | | Merge-request: !1557
| * | | FindMPI: Correct legacy variable handlingChristian Pfeiffer2017-12-051-10/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a minor logic error, MPI_LIBRARY, MPI_EXTRA_LIBRARY and MPI_<LANG>_LIBRARIES hints are currently not correctly handled and discarded. Additionally, if either C or CXX aren't enabled, there subsequent calls to FindMPI will cause cache variables of the sort "MPI_MPI_EXTRA_LIBRARY-NOTFOUND" to appear due to an error in the compatibility handling. (Doesn't affect functionality)
* | | Merge branch 'findmpi-found-cond' into release-3.10Brad King2017-12-051-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1556
| * | | FindMPI: Fix multiple configure runsChristian Pfeiffer2017-12-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a erroneous logical dependency on a temporary variable, FindMPI would depend its FOUND status on the set of flags needed to support compiler-implicit MPI support after the first configure run. This behavior is especially causing a misreported NOT FOUND status after the first run on MPI implementations without MPI compiler like MS-MPI or MPICH2 on Windows.
* | | Merge branch 'clang-cl-fix' into release-3.10Brad King2017-11-281-3/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !1522
| * | | Clang: Do not mistake clang-cl 6.0 for GNU-like clangİsmail Dönmez2017-11-281-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added by commit v3.10.0-rc2~2^2 (Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI, 2017-10-10) is incorrectly detecting clang-cl 6.0 as GNU-like. Currently cmake is testing if the clang compiler accepts `--version` to see if it accepts GNU style flags. However, with the latest llvm snapshot this also works for clang-cl: > clang-cl --version clang version 6.0.0 (trunk) Target: x86_64-pc-windows-msvc Thread model: posix InstalledDir: C:\Program Files\LLVM\bin So instead we should use the `/?` flag which fails with clang but works with clang-cl: > clang-cl /? &> /dev/null; echo $? 0 > clang /? &> /dev/null; echo $? 1 Fixes: #17518
* | | Merge branch 'cuda-implicit-include-dirs' into release-3.10Brad King2017-11-271-0/+3
|\ \ \ | |_|/ |/| | | | | Merge-request: !1528
| * | CUDA: Treat /usr/include as an implicit include directoryBrad King2017-11-271-0/+3
| |/ | | | | | | | | | | We already do this for C and C++. Fixes: #17512
* | GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-211-2/+25
|/ | | | | | | | | | | | | According to the documentation, tests can be discovered for a target multiple times by using a different prefix and/or suffix to ensure name uniqueness. However, while this worked for gtest_add_tests, it did not work with gtest_discover_tests because the generated file that sets up the tests was named based only on the target name, and so subsequent discovery from the same target would clobber earlier discovery. Fix this by introducing a counter that records how many times discovery has been used on a target, and use this to generate unique names of the generated test list files.
* FindOpenGL: Add option to prefer GLVND for legacy GLBrad King2017-11-151-13/+56
| | | | | | | | | | | | | | | | | Since commit v3.10.0-rc5~3^2 (FindOpenGL: Default to non-GLVND libraries for legacy GL, 2017-11-08) users may set `OPENGL_gl_LIBRARY` to empty to use GLVND components for the legacy GL interfaces. This is useful only when one knows in advance that the GLVND components will be found. Add a `OpenGL_GL_PREFERENCE` variable to specify a preference for legacy GL or GLVND. The latter can suppress `OPENGL_gl_LIBRARY` only when the needed GLVND components are found. If no preference is explicitly specified, choose a default based on whether GLVND components were requested (because this indicates the project has been updated for CMake 3.10). Issue: #17437 Issue: #17449
* FindOpenGL: Re-order component library searchesBrad King2017-11-151-7/+8
| | | | | Move the search for the legacy GL library to after the GLVND libraries. For now we still always look for both.
* Merge branch 'doxygen_dot' into release-3.10Brad King2017-11-101-1/+5
|\ | | | | | | Merge-request: !1472
| * FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat modeAndré Apitzsch2017-11-101-1/+5
| | | | | | | | | | | | `DOXYGEN_DOT_FOUND` is only set if `_Doxygen_keep_backward_compat` is used (when no components are requested), so use `Doxygen_dot_FOUND` directly. Preserve the "YES" or "NO" value used previously.
* | Merge branch 'FindOpenGL-no-glvnd-for-GL' into release-3.10Brad King2017-11-091-20/+24
|\ \ | | | | | | | | | Merge-request: !1466
| * | FindOpenGL: Default to non-GLVND libraries for legacy GLBrad King2017-11-091-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects using `OPENGL_LIBRARIES` or `OpenGL::GL` expect legacy GL. Although GLVND OpenGL+GLX provides legacy GL interfaces, using those library files may conflict with legacy GL library files used by dependencies (or dependents) of such projects. Therefore we should not yet use OpenGL+GLX when a legacy GL library is available. If `OPENGL_gl_LIBRARY` is set then use it as the legacy GL library. If it is *not* set then fall back to using GLVND OpenGL+GLX to provide legacy GL interfaces. This will allow users to build projects using GLVND even if they have not been ported. Fixes: #17437
* | | Merge branch 'FindHDF5-c-version' into release-3.10Brad King2017-11-081-1/+1
|\ \ \ | | | | | | | | | | | | 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 branch 'implicit-lib-gcceh' into release-3.10Brad King2017-11-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 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 branch 'FindOpenGL-clarify-libraries' into release-3.10Brad King2017-11-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | 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 branch 'csharp-version-english' into release-3.10Brad King2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'irsl-win2018' into release-3.10Brad King2017-11-061-3/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Merge-request: !1451
| * | | | | | | | | IRSL: Add support for the 2018 release on Windows.Christian Pfeiffer2017-11-061-3/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17421
* | | | | | | | | Merge branch 'mingw-clang-c-compile-features' into release-3.10Brad King2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'clang-cl-TP' into release-3.10Brad King2017-10-252-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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