summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'omp-oacc-werror-return-type' into release-3.10Brad King2017-10-242-3/+11
|\ | | | | | | 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 branch 'findmpi-core-count' into release-3.10Brad King2017-10-241-7/+2
|\ \ | | | | | | | | | 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 branch 'FindOpenCL-more-versions' into release-3.10Brad King2017-10-231-1/+1
|\ \ | | | | | | | | | Merge-request: !1398
| * | FindOpenCL: Add detection of OpenCL 2.1 and 2.2Henry Schreiner2017-10-231-1/+1
| |/
* | Merge branch 'gnuid-cmp54-fix' into release-3.10Brad King2017-10-231-0/+5
|\ \ | | | | | | | | | Merge-request: !1400
| * | GNUInstallDirs: Enable CMP0054Christian Pfeiffer2017-10-231-0/+5
| |/ | | | | | | Fixes: #17381
* | Merge branch 'flang-remove-boundscheck' into release-3.10Brad King2017-10-191-2/+0
|\ \ | | | | | | | | | 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.
* | Merge branch 'findopenmp-lib-paths' into release-3.10Brad King2017-10-171-7/+21
|\ \ | | | | | | | | | Merge-request: !1385
| * | FindOpenMP: Improve OMP libraries searchChristian Pfeiffer2017-10-171-7/+21
| | | | | | | | | | | | | | | | | | | | | This supports libraries given as full path and filters libraries given in CMAKE_<LANG>_STANDARD_LIBRARIES. Fixes: #17351
* | | Merge branch 'FindXMLRPC-no-includes' into release-3.10Brad King2017-10-111-29/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !1377
| * | | FindXMLRPC: Tolerate no include directoriesBrad King2017-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `xmlrpc-c-config $modules --cflags` may report no `-I` flags if the headers are in a standard location like `/usr/include`. In this case it is okay for `XMLRPC_INCLUDE_DIRS` to be empty. Ideally the `--cflags` output should be used as hints for a `find_path` call to really find the headers as we do for other find modules, but simply assuming no explicit include directories are needed is good enough for now. Fixes: #17347
| * | | FindXMLRPC: Drop unnecessary exec_program code pathsBrad King2017-10-111-28/+12
| | |/ | |/| | | | | | | | | | We always have `execute_process` now, so drop our ancient `exec_program` code paths that are never used anymore.
* | | Merge branch 'clang-msvc-help' into release-3.10Brad King2017-10-113-0/+37
|\ \ \ | | | | | | | | | | | | Merge-request: !1373
| * | | Clang: Diagnose unsupported GNU-like clang targeting MSVC ABIBrad King2017-10-103-0/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The LLVM/Clang installer on Windows provides a `LLVM/bin` directory containing `clang.exe` and `clang++.exe` command-line tools that have a GNU-like command-line but target the MSVC ABI (instead of MinGW). We do not support this combination, so diagnose and reject it explicitly. Tell users what to do to use the `clang-cl.exe` tool instead. Issue: #16439
* | | Merge branch 'cpack-deb-mr-1296-fix' into release-3.10Brad King2017-10-111-6/+33
|\ \ \ | | | | | | | | | | | | Merge-request: !1375
| * | | CPack/Deb: fix for regex passing even if invalid characters are presentDomen Vrankar2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Regex [+-~] passes all characters between + and ~ and not only +, - and ~
| * | | CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exceptionDomen Vrankar2017-10-101-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also contain release and epoch version so regex test should expect the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE and CPACK_DEBIAN_PACKAGE_EPOCH are not set. Also since the checks were not performed in the past the regex test of CPACK_DEBIAN_PACKAGE_VERSION variable content should only report author warnings instead of errors in case of the test fail. Fixes: #17339
* | | | Merge branch 'ExternalProject-CMP0054' into release-3.10Brad King2017-10-111-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | Merge-request: !1369
| * | | ExternalProject: Avoid if() auto-dereferene in quoted argumentsBrad King2017-10-111-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | The implementation of this module doesn't expect such dereferences to happen, but can when a project sets a variable called `x`. Set `CMP0054` explicitly to get its NEW behavior. Fixes: #17335
* | | Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10Brad King2017-10-101-1/+39
|\ \ \ | | | | | | | | | | | | Merge-request: !1360
| * | | FindCUDA: Update for CUDA 9 breakup of nppi into multiple librariesRobert Maynard2017-10-061-1/+39
| |/ / | | | | | | | | | Fixes: #17310
* | | Merge branch 'FindProtobuf-doc-typo' into release-3.10Brad King2017-10-061-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1359
| * | | FindProtobuf: fix documentation typoAndré Apitzsch2017-10-061-1/+1
| |/ / | | | | | | | | | | | | | | | Fix typo in documentation added by commit v3.10.0-rc1~18^2 (FindProtobuf: add flag to allow descriptor files to be generated, 2017-09-21).
* | | Merge branch 'ipo-escape-toolchain-path' into release-3.10Brad King2017-10-062-6/+6
|\ \ \ | | | | | | | | | | | | Merge-request: !1356
| * | | IPO: Fix support for spaces in path to archive toolsThomas Stenersen2017-10-062-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | In the normal archiving rules the ``<CMAKE_AR>`` placeholder is replaced by the generators with a properly-quoted path to the tool. In the IPO rules we specify the tools directly, so we need to quote them. Fixes: #17326
* | | Merge branch 'FindJava-tolerant-versions' into release-3.10Brad King2017-10-061-25/+42
|\ \ \ | | | | | | | | | | | | Merge-request: !1355
| * | | FindJava: Revise version parsing to support Java 9Brad King2017-10-061-25/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | Java 9 has only one component. Revise the logic to tolerate any number of version components 1 through 4. Fix the parsing of individual components. Fixes: #17325
* | | Merge branch 'findopenmp-fix-verbose' into release-3.10Brad King2017-10-061-2/+13
|\ \ \ | |/ / |/| / | |/ Merge-request: !1348
| * FindOpenMP: Fix link flags being used for compileChristian Pfeiffer2017-10-051-2/+13
| | | | | | | | Fixes: #17307
* | Merge topic 'cuda-default-link-launcher'Brad King2017-10-051-1/+29
|\ \ | | | | | | | | | | | | | | | | | | 7914fb82 CUDA: Fix default selection of host compiler used to drive linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1341
| * | CUDA: Fix default selection of host compiler used to drive linkingBrad King2017-10-041-1/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no explicit `CMAKE_CUDA_HOST_COMPILER` is specified by the user then we do not pass `-ccbin` to `nvcc`. In this case, nvcc's link line we extract during the compiler identification step may not have the absolute path to the host compiler it uses to drive linking. If it is not absolute, use the `PATH=` from nvcc's output to search for it since that is the one `nvcc` would use. This fixes our internal `CMAKE_CUDA_HOST_LINK_LAUNCHER` value used to construct link lines when using `CUDA` as the linker language. It needs to match the host compiler `nvcc` uses internally during compilation. Fixes: #17323
* | Merge topic 'FindCUDA-run_nvcc-CMP0007'Brad King2017-10-051-5/+4
|\ \ | | | | | | | | | | | | | | | | | | 8b09c20c FindCUDA: Fix CMP0007 warning in run_nvcc.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1340
| * | FindCUDA: Fix CMP0007 warning in run_nvcc.cmakeUmar Arshad2017-10-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set `CMP0007` to `NEW` for the entire script. The script comes with CMake and is aware of the policy's behavior, so set the policy to ensure that its warnings do not show up during the build phase. Fixes: #16579
* | | Merge topic 'find-matlab-r2017b'Brad King2017-10-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f156b2fb FindMatlab: Add support for MATLAB 2017b Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !1343
| * | | FindMatlab: Add support for MATLAB 2017bJamie Snape2017-10-041-1/+1
| | |/ | |/|
* | | FindOpenMP: Fix version if OpenMP doesn't workChristian Pfeiffer2017-10-041-2/+6
|/ /
* | Merge topic 'compiler-version-internal'Brad King2017-10-047-2/+30
|\ \ | |/ |/| | | | | | | | | | | | | 1bdb8cd2 IAR: Detect compiler platform version b96ca728 Add infrastructure to detect secondary compiler version information f952f16d Help: Fix placement of one variable in cmake-variables manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1324
| * IAR: Detect compiler platform versionStefan Andersson2017-10-031-2/+5
| | | | | | | | | | | | | | | | `__IAR_SYSTEMS_ICC__` provides additional version information that we need to determine correct usage of the compiler. Extract and store it as `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL`. Issue: #17264
| * Add infrastructure to detect secondary compiler version informationBrad King2017-10-036-0/+25
| | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL` variable to hold a secondary/internal compiler version number detected at the same time as the primary compiler version. This will be useful for some compilers where we need such a number to determine correct usage. Inspired-by: Stefan Andersson <tfosm@hotmail.com> Suggested-by: Norbert Lange <norbert.lange@andritz.com> Issue: #17264
* | Merge topic 'FindProtobuf-gen-desc'Brad King2017-10-031-10/+34
|\ \ | |/ |/| | | | | | | | | | | 1299f4cc FindProtobuf: add flag to allow descriptor files to be generated 4e91be95 FindProtobuf: Refactor custom command output listing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1301
| * FindProtobuf: add flag to allow descriptor files to be generatedPeter Mitrano2017-10-021-3/+26
| | | | | | | | | | | | | | | | | | | | | | - The .desc files will be in the same folder as the generated .cc and .h files. - Paths to generate .desc files are stored in a variable passed in - This is only implemented for C++ - Remove legacy ARGS - Add test that generates and uses C++ protobuf message - Add test that checks that the generated .desc file can be instantiated with DynamicMessageFactory - Add Help rst for new feature
| * FindProtobuf: Refactor custom command output listingBrad King2017-10-021-7/+8
| | | | | | | | | | | | Reduce duplication by storing the custom command outputs in variables. Also, since custom command outputs are automatically marked as generated we do not need to do so explicitly.
* | Merge topic 'autogen-predefs'Brad King2017-10-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6bbc1e77 Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 75c98b5e Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 1d7f099d Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1328
| * | Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINESSebastian Holtermann2017-09-291-0/+1
| | |
* | | FindBoost: Improve messages when a Boost CMake package is foundBrad King2017-09-291-3/+2
| | | | | | | | | | | | | | | | | | Add a test for this case to verify the messages. This test will also be valuable to cover this code path in which we've had several regressions recently.
* | | Merge topic 'cuda_9_support'Brad King2017-09-291-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | fe37b994 CUDA: Add support for requesting C++98 under CUDA 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1315
| * | CUDA: Add support for requesting C++98 under CUDA 9Robert Maynard2017-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Starting in CUDA 9 the default compilation mode is C++14, and you need to explicitly enable C++98/03 mode. While at it, document `14` among the values for `CUDA_STANDARD`. This was accidentally left out of commit v3.9.0-rc1~118^2 (CUDA: Add support for the C++14 standard flag, 2017-05-11).