Commit Graph

8321 Commits

Author SHA1 Message Date
Craig Scott
80784ef77f Merge topic 'project-homepage-url'
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
2018-03-17 18:24:44 -04:00
Alex Turbov
73f9b2974c project: Add HOMEPAGE_URL named parameter
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>
2018-03-17 08:25:48 +11:00
Brad King
30b7c40ad8 Merge topic 'gtest_discover_tests_timeout'
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
2018-03-16 07:27:16 -04:00
Brad King
bd64d60194 Merge topic 'xl-cc-default-std'
194b74daec XL: Fix C default level detection when invoked as 'cc'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1854
2018-03-15 07:52:59 -04:00
Brad King
c388487bd5 Merge topic 'findjni-mips-r6-new-arch'
8c92596e96 FindJNI: add some new architecture names for mips release 6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1853
2018-03-15 07:51:29 -04:00
Craig Scott
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash
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
2018-03-15 07:36:42 -04:00
Brad King
194b74daec XL: Fix C default level detection when invoked as 'cc'
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
2018-03-14 14:07:00 -04:00
YunQiang Su
8c92596e96 FindJNI: add some new architecture names for mips release 6 2018-03-14 11:17:19 -04:00
Brad King
83071fff75 Merge topic 'ep-support-passing-var-ending-with-notfound'
7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1838
2018-03-12 13:49:44 -04:00
Jean-Christophe Fillion-Robin
7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND" 2018-03-12 13:45:50 -04:00
Brad King
6e56f28808 Merge topic 'libxml2-target'
9ef3abd3f3 FindLibXml2: provide imported target LibXml2::LibXml2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1823
2018-03-09 07:44:30 -05:00
Brad King
897bd57025 Merge topic 'GenerateExportHeader-C'
de348a9638 GenerateExportHeader: Add support for C projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1799
2018-03-09 07:39:43 -05:00
Rolf Eike Beer
9ef3abd3f3 FindLibXml2: provide imported target LibXml2::LibXml2 2018-03-08 18:31:12 +01:00
Arnaud Gelas
de348a9638 GenerateExportHeader: Add support for C projects
Previously only C++ projects were supported.

Fixes: #16967
2018-03-08 10:05:14 -05:00
Brad King
156a959410 Merge topic 'FindGDAL-absolute-path'
694fce19b6 FindGDAL: Handle gdal-config printing absolute path to library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1808
2018-03-08 09:58:56 -05:00
Brad King
50b2d0c944 Merge topic 'misc-typos'
32f6b7a43b Fix misc typos in documentation and comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1826
2018-03-08 09:58:19 -05:00
Brad King
151763c9b2 Merge topic 'curl-target'
ee06f3c339 FindCURL: Revise documentation markup
83c0cb3f03 FindCURL: provide imported target CURL::CURL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1822
2018-03-08 09:56:40 -05:00
Brad King
69b152967d Merge topic 'cuda-no-device-link-rsp'
f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1831
2018-03-08 09:48:28 -05:00
luz.paz
32f6b7a43b Fix misc typos in documentation and comments 2018-03-07 10:54:46 -05:00
Brad King
57f35bba84 Merge branch 'cuda-no-device-link-rsp' into release-3.11
Merge-request: !1831
2018-03-07 10:52:54 -05:00
Brad King
f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC
The nvcc compiler does not support `@<rspfile>` arguments.  It does
offer a `--options-file` argument that can be investigated later.

Fixes: #17797
2018-03-07 10:30:35 -05:00
Adam Thompson
694fce19b6 FindGDAL: Handle gdal-config printing absolute path to library
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).
2018-03-07 09:29:57 -05:00
Brad King
ee06f3c339 FindCURL: Revise documentation markup 2018-03-07 09:06:01 -05:00
Brad King
9ceafdfd4d Merge topic 'FindOpenMP-AppleClang'
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
2018-03-07 08:33:33 -05:00
Henry Fredrick Schreiner
e3cd7c1e01 FindOpenMP: Add support for AppleClang compiler
This is possible using an external `omp` library and by passing
the flag past the compiler driver via `-Xclang -fopenmp`.

Fixes: #17775
2018-03-07 08:27:35 -05:00
Henry Fredrick Schreiner
b4c539e651 FindOpenMP: Verify in test source that OMP library is linked 2018-03-07 08:25:45 -05:00
Henry Fredrick Schreiner
7dd8c7a680 FindOpenMP: Improve inclusion of helper modules
Use `CMAKE_CURRENT_LIST_DIR` instead of `CMAKE_ROOT`.
Do not include modules inside a loop.
2018-03-07 08:24:27 -05:00
Brad King
4f29bf5672 Merge topic 'xl-new-compiler-macros'
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
2018-03-07 07:12:02 -05:00
Rolf Eike Beer
83c0cb3f03 FindCURL: provide imported target CURL::CURL 2018-03-06 22:53:35 +01:00
Brad King
eb1a9be4b6 XL: Recognize compilers identified by __ibmxl__
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
2018-03-06 07:43:04 -05:00
Brad King
74dac86c76 Merge topic 'findjava-jar-in-dev-component'
596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1807
2018-02-28 08:16:52 -05:00
Giel van Schijndel
596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development
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.
2018-02-27 17:32:09 +01:00
Brad King
2bcccd07bd Merge topic 'modules-restore-path-suffixes'
7b1c1424 Modules: Restore recently removed search path suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1802
2018-02-27 09:26:31 -05:00
Brad King
e708dac65f Merge branch 'modules-restore-path-suffixes' into release-3.11
Merge-request: !1802
2018-02-26 10:53:16 -05:00
Brad King
7b1c14241d Modules: Restore recently removed search path suffixes
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
2018-02-26 10:52:11 -05:00
Brad King
e4df2313c1 Merge topic 'ipo-support'
a18147e9 MSVC,Clang,Flang: Add IPO support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1721
2018-02-26 08:59:32 -05:00
xoviat
a18147e933 MSVC,Clang,Flang: Add IPO support
Fixes: #17692
2018-02-23 10:27:57 -05:00
Brad King
020be379f4 Merge topic 'fortran-compiler'
965f977c Fortran: Adjust compiler candidates based on host platform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1780
2018-02-22 11:37:10 -05:00
Brad King
fef001884f Merge topic 'FindLua-tolerate-var'
6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1778
2018-02-21 10:44:08 -05:00
Brad King
fcae625f48 Merge topic 'FindwxWidget/fix-eating-minusL-in-path'
67db3ff9 Fix eating "-L" in path names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1775
2018-02-21 10:43:40 -05:00
Brad King
283562624c Merge topic 'find-linker'
e936b6bb CMakeFindBinUtils: Find linker in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1720
2018-02-21 10:43:09 -05:00
xoviat
e936b6bb5a CMakeFindBinUtils: Find linker in PATH
Fixes: #17693
2018-02-21 10:42:15 -05:00
xoviat
965f977c7c Fortran: Adjust compiler candidates based on host platform
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
2018-02-21 10:23:38 -05:00
Frank Benkstein
6cced78725 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
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.
2018-02-20 16:13:45 -05:00
Brad King
a8d182fbbf Merge topic 'ti-depfile-flag-fix'
cab9af7e Compiler/TI: Fix depfile generation for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1774
2018-02-20 11:54:15 -05:00
Brad King
82c23d6afc Merge branch 'ti-depfile-flag-fix' into release-3.11
Merge-request: !1774
2018-02-20 11:52:30 -05:00
Grzegorz Dobinski
cab9af7e97 Compiler/TI: Fix depfile generation for C++
In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile
generation for Ninja, 2017-10-16) the flag for C++ was added in a
variable with a typo in its name.  Fix the spelling.

Issue: #17360
2018-02-20 11:52:11 -05:00
Brad King
3bc3762c7c Merge topic 'findzlib-folder-priority'
c01eede8 FindZLIB: Search names per directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1769
2018-02-20 11:42:23 -05:00
Brad King
1fbd5f4a7e Merge topic 'CheckCSourceRuns-log-run-output'
b25b39ad CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1772
2018-02-20 11:41:50 -05:00
Brad King
088c1876ef Merge topic 'follow-up-misc-typos'
287e7a17 Maint: misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1771
2018-02-20 11:41:15 -05:00