summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* | | Merge topic 'external-project-refactor-ep_get_complete_stampfile'Brad King2017-09-291-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | da470525 ExternalProject: Refactor code introducing _ep_get_complete_stampfile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1323
| * | | ExternalProject: Refactor code introducing _ep_get_complete_stampfileJean-Christophe Fillion-Robin2017-09-281-5/+11
| | | |
* | | | Merge topic 'FindMatlab-version-quoting'Brad King2017-09-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a245f850 FindMatlab: Fix extraction of quoted version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1316
| * | | | FindMatlab: Fix extraction of quoted version numberBrad King2017-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version string in recent Matlab versions has changed. Now the version number is inside two `'`. Patch-by: nama on gitlab.kitware.com Fixes: #17308
* | | | | Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMESSebastian Holtermann2017-09-271-0/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of adding `Q_OBJECT` and `Q_GADGET` to the macro search list in `Source/cmQtAutoGenerators.cxx`, add them in `Modules/CMakeGenericSystem.cmake` to the default value of `CMAKE_AUTOMOC_MACRO_NAMES`. Also add `Q_NAMESPACE` to `CMAKE_AUTOMOC_MACRO_NAMES` which closes #17299.
* | | | Merge topic 'GetPrerequisites-no-clear-on-missing'Brad King2017-09-271-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a7b8c83 GetPrerequisites: Restore behavior on missing binary of not clearing list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1312
| * | | | GetPrerequisites: Restore behavior on missing binary of not clearing listBrad King2017-09-261-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for execute_process() calls, 2015-07-29), `get_prerequisites` would simply warn on a missing binary and not update the result list at all. That commit accidentally made the case an error. This was fixed by commit v3.8.0-rc1~110^2 (GetPrerequisites: Do not fail on files we cannot find, 2017-01-10), but the fix also cleared the result list. Clearing the list is incorrect because it is supposed to be able to accumulate results over multiple calls. Remove the list clearing behavior to restore the original behavior on a missing binary. Fixes: #17306
* | | | Merge topic 'autogen-per-config-sources'Brad King2017-09-271-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4603d6b0 Autogen: Docs: Add documentation internal links f86ba8ee Autogen: Reintroduce per-config sources support 5d3bca64 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1307
| * | | | Autogen: Reintroduce per-config sources supportSebastian Holtermann2017-09-251-1/+3
| | | | | | | | | | | | | | | | | | | | Reintroduce per-config sources support in AUTOGEN but disable it by default.
* | | | | FindOpenGL: Add support for GLVND on LinuxTom Fogal2017-09-251-39/+280
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find GLVND components if available. Add `GLX` and `EGL` options for COMPONENTS that allow requesting these libraries explicitly. Introduce new import targets for these windowing-system-specific libraries. On a GLVND system, populate the legacy `OPENGL_LIBRARIES` variable and the `OpenGL::GL` target using the `OpenGL` and `GLX` components. On non-GLVND systems, continue to use the legacy `GL` library and simply do not provide the GLVND components. Application code can choose to adapt based on the availability of GLVND components as imported targets.
* | | | Merge topic 'FindOpenACC'Brad King2017-09-251-0/+252
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3b6f291 FindOpenACC: Add module to detect compiler support for OpenACC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1209
| * | | | FindOpenACC: Add module to detect compiler support for OpenACCTin Huynh2017-09-221-0/+252
| | | | |
* | | | | Merge topic 'cpackifw-options'Brad King2017-09-251-6/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a24ab6b CPackIFW: Add some options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1298
| * | | | | CPackIFW: Add some optionsKonstantin Podsvirov2017-09-211-6/+28
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The `CPackIFW` module `cpack_ifw_configure_component` and `cpack_ifw_configure_component_group` commands gained a new `REPLACES` and `CHECKABLE` options.
* | | | | Merge topic 'FindOpenMP-CMP0054'Brad King2017-09-251-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | dd5324ab FindOpenMP: Avoid CMP0054 warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1303
| * | | | FindOpenMP: Avoid CMP0054 warningsBrad King2017-09-221-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When invoked in projects that don't set CMP0054 to NEW, FindOpenMP triggers a warning: CMake Warning (dev) at .../Modules/FindOpenMP.cmake:... (if): Policy CMP0054 is not set...Quoted variables like "c" will no longer be dereferenced when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Set the policy within the module's scope to avoid this. Fixes: #17292
* | | | Merge topic '`16839-better-tvos-support`'Craig Scott2017-09-242-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45e30d12 Xcode: Add team to compiler-id project 0be0e02c Xcode: Add tvOS and watchOS toolchain file support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1278