summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindwxWidgets-msvc-v141'Brad King2018-03-201-6/+6
|\ | | | | | | | | | | | | 73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1861
| * FindwxWidgets: Add support for MSVC versions of the v141 toolsetAdam Oleksy2018-03-191-6/+6
| | | | | | | | | | | | | | | | Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141 toolset, 2017-03-22) more MSVC updates have been released that use a MSVC_VERSION value higher than 1910. Revise our checks accordingly. Issue: #16735
* | Merge topic 'revert-findqt4-dirs-fix'Brad King2018-03-191-12/+1
|\ \ | | | | | | | | | | | | | | | | | | cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1867
| * | FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS dir even if empty, 2017-11-19) regressed existing builds on some machines. Revert it for CMake 3.11 pending further investigation. Fixes: #17814, #17817 Issue: #14155, #17492
* | | Merge topic 'intel-initializer-list'Brad King2018-03-191-5/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fc96d99c3e Features: Record initializer list support for Intel 14 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1855
| * | | Features: Record initializer list support for Intel 14 and aboveBrad King2018-03-161-5/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features recorded by commit v3.6.0-rc1~120^2~5 (Features: Record standards and features for Intel C++ on UNIX, 2016-04-28) for the Intel compiler left out initializer list support because our test case in `Tests/CompileFeatures/cxx_generalized_initializers.cpp` caused an internal compiler error. It turns out this is because the Intel compiler asserts the `initializer_list` constructor signatures to verify that they match its own `<initializer_list>` header. It was our dummy implementation used to test the language feature without any headers that caused the ICE. Revise it to use a constructor signature accepted by the Intel compiler. Fixes: #17829
* | | Merge topic 'project-homepage-url'Craig Scott2018-03-173-3/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73f9b2974c project: Add HOMEPAGE_URL named parameter fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION 9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1816
| * | | project: Add HOMEPAGE_URL named parameterAlex Turbov2018-03-163-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets variables like PROJECT_HOMEPAGE_URL, which can be used as default values for various things (packaging modules, doxygen defaults, etc.). Some packaging modules have been updated to do this as part of this commit. Co-Author: Craig Scott <craig.scott@crascit.com>
* | | | Merge topic 'gtest_discover_tests_timeout'Brad King2018-03-161-5/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1851
| * | | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-151-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
* | | | Merge topic 'xl-cc-default-std'Brad King2018-03-151-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 194b74daec XL: Fix C default level detection when invoked as 'cc' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1854
| * | | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IBM XL C compiler does not define `__STDC__` when invoked as plain `cc` instead of `xlc`, so `CMAKE_C_STANDARD_COMPUTED_DEFAULT` does not get set and CMake fails. Teach CMake about the XL compiler's default C standard in this case. Fixes: #17649
* | | | Merge topic 'findjni-mips-r6-new-arch'Brad King2018-03-151-1/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 8c92596e96 FindJNI: add some new architecture names for mips release 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1853
| * | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| |/ /
* | | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-03-121-4/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1838
| * | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-121-4/+14
| |/ /
| * | Merge branch 'cuda-no-device-link-rsp' into release-3.11Brad King2018-03-071-0/+6
| |\ \ | | | | | | | | | | | | Merge-request: !1831
* | \ \ Merge topic 'libxml2-target'Brad King2018-03-091-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ef3abd3f3 FindLibXml2: provide imported target LibXml2::LibXml2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1823
| * | | | FindLibXml2: provide imported target LibXml2::LibXml2Rolf Eike Beer2018-03-081-0/+12
| | | | |
* | | | | Merge topic 'GenerateExportHeader-C'Brad King2018-03-091-10/+37
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | de348a9638 GenerateExportHeader: Add support for C projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1799
| * | | | GenerateExportHeader: Add support for C projectsArnaud Gelas2018-03-081-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only C++ projects were supported. Fixes: #16967
* | | | | Merge topic 'FindGDAL-absolute-path'Brad King2018-03-081-4/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 694fce19b6 FindGDAL: Handle gdal-config printing absolute path to library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1808
| * | | | | FindGDAL: Handle gdal-config printing absolute path to libraryAdam Thompson2018-03-071-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGDAL uses GDAL's 'gdal-config' utility to obtain the path to GDAL's library (on systems identified by CMake's UNIX variable). Older versions formatted this information like that of dependent libraries: -L/path/to/gdal/lib -lgdal[suffix] Newer versions instead provide the full path to the library: /path/to/gdal/lib/[prefix]gdal[suffix] FindGDAL now supports both formats. Entries that don't start with '-L' or '-l' are only considered if they are absolute paths that exist on disk. Furthermore, libraries are only considered if the name contains 'gdal' (checked case-insensitively).
* | | | | | Merge topic 'misc-typos'Brad King2018-03-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32f6b7a43b Fix misc typos in documentation and comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1826
| * | | | | | Fix misc typos in documentation and commentsluz.paz2018-03-071-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'curl-target'Brad King2018-03-081-7/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee06f3c339 FindCURL: Revise documentation markup 83c0cb3f03 FindCURL: provide imported target CURL::CURL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1822
| * | | | | | FindCURL: Revise documentation markupBrad King2018-03-071-7/+15
| | | | | | |
| * | | | | | FindCURL: provide imported target CURL::CURLRolf Eike Beer2018-03-061-0/+12
| |/ / / / /
* | | | | | Merge topic 'cuda-no-device-link-rsp'Brad King2018-03-081-0/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1831
| * | | | | CUDA: Do not pass unsupported @rspfile arguments to NVCCBrad King2018-03-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nvcc compiler does not support `@<rspfile>` arguments. It does offer a `--options-file` argument that can be investigated later. Fixes: #17797
* | | | | | Merge topic 'FindOpenMP-AppleClang'Brad King2018-03-071-3/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3cd7c1e01 FindOpenMP: Add support for AppleClang compiler b4c539e651 FindOpenMP: Verify in test source that OMP library is linked 7dd8c7a680 FindOpenMP: Improve inclusion of helper modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1812
| * | | | | | FindOpenMP: Add support for AppleClang compilerHenry Fredrick Schreiner2018-03-071-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is possible using an external `omp` library and by passing the flag past the compiler driver via `-Xclang -fopenmp`. Fixes: #17775
| * | | | | | FindOpenMP: Verify in test source that OMP library is linkedHenry Fredrick Schreiner2018-03-071-0/+1
| | | | | | |
| * | | | | | FindOpenMP: Improve inclusion of helper modulesHenry Fredrick Schreiner2018-03-071-3/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Use `CMAKE_CURRENT_LIST_DIR` instead of `CMAKE_ROOT`. Do not include modules inside a loop.
* | | | | | Merge topic 'xl-new-compiler-macros'Brad King2018-03-074-10/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | eb1a9be4b6 XL: Recognize compilers identified by __ibmxl__ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Chuck Atkins <chuck.atkins@kitware.com> Merge-request: !1820
| * | | | XL: Recognize compilers identified by __ibmxl__Brad King2018-03-064-10/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IBM XL C/C++ for Linux versions 13.1.6 and above no longer define `__IBMC__` or `__IBMCPP__` by default (see `-qxlcompatmacros`). Instead `__ibmxl__` now identifies the compiler along with some related new version macros. Fixes: #17784
| * | | Merge branch 'modules-restore-path-suffixes' into release-3.11Brad King2018-02-264-0/+11
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1802
| * \ \ \ Merge branch 'ti-depfile-flag-fix' into release-3.11Brad King2018-02-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1774
* | \ \ \ \ Merge topic 'findjava-jar-in-dev-component'Brad King2018-02-281-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1807
| * | | | | FindJava: Add Java_JAR_EXECUTABLE to a component: DevelopmentGiel van Schijndel2018-02-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All discovered executables were placed in a component, except for 'jar'. This forced the use of find_package(Java) without any component specification. This commit adds 'jar' to the 'Development' component, because that's what it's used for.
* | | | | | Merge topic 'modules-restore-path-suffixes'Brad King2018-02-274-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | 7b1c1424 Modules: Restore recently removed search path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1802
| * | | | Modules: Restore recently removed search path suffixesBrad King2018-02-264-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
* | | | | Merge topic 'ipo-support'Brad King2018-02-261-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a18147e9 MSVC,Clang,Flang: Add IPO support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1721
| * | | | | MSVC,Clang,Flang: Add IPO supportxoviat2018-02-231-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17692
* | | | | | Merge topic 'fortran-compiler'Brad King2018-02-221-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 965f977c Fortran: Adjust compiler candidates based on host platform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1780
| * | | | | | Fortran: Adjust compiler candidates based on host platformxoviat2018-02-211-6/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typical Fortran compiler command-line tool names differ on Windows and non-Windows platforms. Also, the name `ifc` should not be used on Windows because there is an `ifc.exe` tool in Visual Studio that is unrelated. Fixes: #17752
* | | | | | Merge topic 'FindLua-tolerate-var'Brad King2018-02-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1778
| * | | | | | FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variableFrank Benkstein2018-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path` call and unset the cache entry before each use. Unset a plain variable of this name too in case it was set by project code. Otherwise the `find_path` call may be skipped and the wrong value used, leading to errors.
* | | | | | | Merge topic 'FindwxWidget/fix-eating-minusL-in-path'Brad King2018-02-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67db3ff9 Fix eating "-L" in path names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1775
| * | | | | | | Fix eating "-L" in path namesRaffi Enficiaud2018-02-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...) replaces the content and results in a wrong path. The regex fixes this.