Commit Graph

44068 Commits

Author SHA1 Message Date
Kitware Robot
e559a3e990 CMake Nightly Date Stamp 2019-07-09 00:01:09 -04:00
Brad King
80d9836a35 Merge topic 'autogen_header_extension'
f8a310c9d1 cmSystemTools: Remove cmSystemTools::FileFormat method
90b5289c55 cmExtraCodeLiteGenerator: Use cmake::Is*Extension for file type detection
e50fa44a35 cmake: Refactor file extension list setup
8214ad442f Tests: Autogen: Extend SameName test with additional header extensions
4a9154537c Autogen: Use cmake::IsHeader/SourceExtension for file type detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3511
2019-07-08 13:00:45 -04:00
Brad King
09fe6664af Merge branch 'release-3.15' 2019-07-08 11:45:10 -04:00
Brad King
58d10debe1 Merge topic 'fortran-submodule-cray'
b0bcd4d7d2 Fortran: Add support for submodules on Cray
33de4d27eb Fortran: Support compilers using no module prefix on submodule files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3504
2019-07-08 11:43:39 -04:00
Brad King
1555837ccb Merge branch 'fortran-submodule-cray' into release-3.15
Merge-request: !3504
2019-07-08 11:33:02 -04:00
Brad King
a6a698aafb Merge topic 'pb-cxx11'
59a30f2acf FindProtobuf: libprotoc also needs C++11
194adaf985 Tests: require C++11 for some protobuf tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3503
2019-07-08 11:28:27 -04:00
Willem Deconinck
b0bcd4d7d2 Fortran: Add support for submodules on Cray
Define `CMAKE_Fortran_SUBMODULE_{SEP,EXT}` for the Cray Fortran
compiler.  Use an empty separator to tell CMake that this compiler does
not use the enclosing module name as a prefix on submodule files.

Issue: #18925
2019-07-08 11:28:27 -04:00
Willem Deconinck
33de4d27eb Fortran: Support compilers using no module prefix on submodule files
Define `CMAKE_Fortran_SUBMODULE_SEP` with an empty string to mean that
the compiler uses no module prefix on its submodule files.

Also add a default fallback to use the `.mod` extension when
`CMAKE_Fortran_SUBMODULE_EXT` is not set.  This is a better guess than
no extension at all.
2019-07-08 11:28:27 -04:00
Brad King
bf7f5d0a22 Merge topic 'threads-are-good'
08cd7f6a02 Swift: support multithreaded compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3506
2019-07-08 11:26:29 -04:00
Kitware Robot
5f2f16319a CMake Nightly Date Stamp 2019-07-08 00:01:06 -04:00
Kitware Robot
580c694363 CMake Nightly Date Stamp 2019-07-07 00:01:06 -04:00
Kitware Robot
b9c4d26c5d CMake Nightly Date Stamp 2019-07-06 00:01:06 -04:00
Kitware Robot
f56393f0bd CMake Nightly Date Stamp 2019-07-05 00:01:09 -04:00
Craig Scott
d09b2287b3 Merge branch 'release-3.15' 2019-07-04 22:31:21 +10:00
Craig Scott
12e46dc413 Merge branch 'docs-misc-trivial-cleanups' into release-3.15
Merge-request: !3498
2019-07-04 22:29:39 +10:00
Craig Scott
01c0d863f4 Merge topic 'docs-misc-trivial-cleanups'
d5b722bbbd Help: Remove mention of CMAKE_INSTALL_DO_STRIP
ddc7ea4696 Help: Clarify how to provide multiple targets with cmake --target
c509f38b7b Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO
9cc6befe1b Help: Improve formatting of list(TRANSFORM) sub-options
074fbdb73f Help: Clean up trivial typos and grammar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3498
2019-07-04 08:25:25 -04:00
Sebastian Holtermann
f8a310c9d1 cmSystemTools: Remove cmSystemTools::FileFormat method 2019-07-04 13:46:19 +02:00
Sebastian Holtermann
90b5289c55 cmExtraCodeLiteGenerator: Use cmake::Is*Extension for file type detection
In cmExtraCodeLiteGenerator.cxx use `cmake::Is*Extension` methods instead of
`cmSystemTools::GetFileFormat` for file type detection.
2019-07-04 13:46:19 +02:00
Sebastian Holtermann
e50fa44a35 cmake: Refactor file extension list setup
Refactor the file extention list setup in cmake.h/cxx and add file extensions
lists for Cuda and Fortran.
2019-07-04 13:46:15 +02:00
Sebastian Holtermann
8214ad442f Tests: Autogen: Extend SameName test with additional header extensions
This adds additional headers with suffixes ".hh" and uppercase ".H" to the
QtAutogen/SameName test.
2019-07-04 12:30:40 +02:00
Sebastian Holtermann
4a9154537c Autogen: Use cmake::IsHeader/SourceExtension for file type detection
In the QtAutogen initializer use `cmake::IsHeaderExtension` and
`cmake::IsSourceExtension` instead of `cmSystemTools::GetFileFormat` for file
type detection.

Closes: #13904
2019-07-04 12:30:40 +02:00
Kitware Robot
f889e0320c CMake Nightly Date Stamp 2019-07-04 00:01:07 -04:00
Rolf Eike Beer
59a30f2acf FindProtobuf: libprotoc also needs C++11 2019-07-03 18:49:49 +02:00
Rolf Eike Beer
194adaf985 Tests: require C++11 for some protobuf tests
Newer versions of Protobuf require C++11, which is reflected in the imported
target created by FindProtobuf. Manually set this for all tests that only use
the variables.
2019-07-03 18:49:49 +02:00
Craig Scott
d5b722bbbd Help: Remove mention of CMAKE_INSTALL_DO_STRIP
It isn't yet clear whether we want to make this part of the
documented API for the install script. Remove it from the
docs before it appears in an official release for now.

Relates: #18997
2019-07-03 23:38:25 +10:00
Craig Scott
ddc7ea4696 Help: Clarify how to provide multiple targets with cmake --target 2019-07-03 23:38:25 +10:00
Craig Scott
c509f38b7b Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO 2019-07-03 23:38:25 +10:00
Craig Scott
9cc6befe1b Help: Improve formatting of list(TRANSFORM) sub-options 2019-07-03 23:38:25 +10:00
Craig Scott
074fbdb73f Help: Clean up trivial typos and grammar 2019-07-03 23:38:25 +10:00
Brad King
0bddcce987 Merge branch 'release-3.15' 2019-07-03 07:32:12 -04:00
Brad King
c723ff216f Merge topic 'FindPostgreSQL-lib-dir'
d21b890a4c FindPostgreSQL: Fix regression in computation of library directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3505
2019-07-03 07:31:10 -04:00
Brad King
1f389b4498 Merge branch 'FindPostgreSQL-lib-dir' into release-3.15
Merge-request: !3505
2019-07-03 07:30:43 -04:00
Craig Scott
8f93d76b79 Merge branch 'release-3.15' 2019-07-03 19:09:44 +10:00
Craig Scott
581e011cef Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15
Merge-request: !3495
2019-07-03 19:08:45 +10:00
Craig Scott
1cc8f85e1a Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR'
16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3495
2019-07-03 05:01:13 -04:00
Kitware Robot
f219b48d8a CMake Nightly Date Stamp 2019-07-03 00:01:09 -04:00
Oleg Chernovskiy
16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files
Fixes: #19390
2019-07-03 08:45:29 +10:00
Saleem Abdulrasool
08cd7f6a02 Swift: support multithreaded compilation
Query the number of logical CPUs available to enable parallel
compilation for Swift.
2019-07-02 10:45:07 -07:00
Brad King
8a42cd155f Merge topic 'static'
8aa0b63bc6 Swift: add rules for static linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3492
2019-07-02 08:45:58 -04:00
Brad King
67859b3d79 Merge topic 'cross_ref_CUDAHOSTCXX_in_CMAKE_CUDA_HOST_COMPILER'
d3ebef4f70 CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3490
2019-07-02 08:44:54 -04:00
Brad King
b08b640926 Merge topic 'deprecate-policy-old'
cf821ff3c4 Add deprecation warnings for policies CMP0067 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3502
2019-07-02 08:44:02 -04:00
Brad King
0b83df71e7 Merge topic 'double-export-error-message'
27d6e51ae9 Tests: add tests for export set error messages
49cfd39007 cmExportBuildFileGenerator: improve error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3486
2019-07-02 08:42:55 -04:00
Brad King
cba6c59e70 Merge branch 'release-3.15' 2019-07-02 08:41:36 -04:00
Brad King
021d147d26 Merge topic 'qt-5.13'
963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground
1a2d6bdefc Tests: Autogen: Use valid rcc compression levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3500
2019-07-02 08:39:38 -04:00
Brad King
5d8dcdf5be Merge topic 'update-expat'
0998f6396a Merge branch 'upstream-expat' into update-expat
ba13dc2aa8 expat 2019-06-19 (d3b78b42)
7449c63f3e expat: Update script to get Expat 2.2.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3501
2019-07-02 08:38:24 -04:00
Brad King
41acd44625 Merge topic 'cuda-no-device-link-when-disabled'
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3491
2019-07-02 08:36:56 -04:00
Brad King
d21b890a4c FindPostgreSQL: Fix regression in computation of library directory
Since commit 368bcba28a (FindPostgreSQL: Find debug lib, imported
configs, 2019-05-09, v3.15.0-rc1~93^2) the `PostgreSQL_LIBRARY` variable
may contain a list and therefore should not be passed to the
`get_filename_component` command directly.  Instead spell out the logic
to compute `PostgreSQL_LIBRARY_DIR` from one of the per-configuration
variables.

Fixes: #19444
2019-07-02 07:32:14 -04:00
Marc Chevrier
554c2ed743 Merge topic 'FindMPI-AddSuffixes'
5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3496
2019-07-02 04:39:19 -04:00
Kitware Robot
9fad9b56f8 CMake Nightly Date Stamp 2019-07-02 00:01:08 -04:00
Brad King
c56201bdac Merge branch 'qt-5.13' into release-3.15
Merge-request: !3500
2019-07-01 10:23:48 -04:00