mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,452 Commits 2 Branches 401 Tags
b0716fbcc5be83ecd082e8b6d101f1137d6f16f8
Commit Graph

38452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Boeckel b0716fbcc5 cmSourceFileLocation: allow skipping ambiguous extensions 
The ambiguous extension logic is an old behavior that ends up taking
lots of extra compute cycles to execute. This is triggered by various
CMake codepaths which pass extension-less paths down when CMake actually
knows that they are not ambiguous. These codepaths will be indicated in
upcoming changes.

Various APIs have gained a cmSourceFileLocationKind parameter, but they
are all optional and default to the existing behavior.
 2018-01-10 11:21:11 -05:00
Brad King ddc4f9a3c0 Merge branch 'release-3.10' 2018-01-10 10:38:11 -05:00
Brad King d08f3f551f Merge topic 'unhardcode-configuration-types' 
1f4d7a07 Help: Add references and backticks in LINK_FLAGS prop_tgt
48f7e2d3 Unhardcode the CMAKE_CONFIGURATION_TYPES values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1345
 2018-01-10 10:35:04 -05:00
Brad King 1be22978e0 Merge topic 'serverTestInfoExpandVariables' 
2c1ecab6 server: Expand generator expressions for test info

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1633
 2018-01-10 10:34:24 -05:00
Brad King e9237334a6 Merge topic 'update-kwiml' 
8a53242d Merge branch 'upstream-KWIML' into update-kwiml
6e921648 KWIML 2018-01-09 (9c2d6cae)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1636
 2018-01-10 10:32:16 -05:00
Kitware Robot 89ec1aacd7 CMake Nightly Date Stamp 2018-01-10 00:01:50 -05:00
Craig Scott e44c5828d3 Merge topic 'add_cuda_to_source_regex' 
81868e6b CUDA: Add cu as default source file extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1629
 2018-01-09 16:15:11 -05:00
Brad King 0cfcea334b Merge branch 'backport-kwiml-riscv' into release-3.10 
There is no corresponding merge request because this fix was
cherry-picked specifically for CMake 3.10.
 2018-01-09 09:57:26 -05:00
Brad King d49986b3b8 KWIML: Backport RISC-V update to CMake 3.10 
Backport KWIML commit 6fc81d8816 (abi.h: Update RISC-V support for
revised macro names, 2017-12-30) to the CMake 3.10 release branch.

The upstream RISC-V project changed some compiler symbols so `__riscv__`
must now be renamed `__riscv`.

Patch-by: Richard W.M. Jones <rjones@redhat.com>
 2018-01-09 09:52:07 -05:00
Brad King e40541339a Merge branch 'release-3.10' 2018-01-09 09:45:58 -05:00
Brad King ce629c5dde Merge topic 'FindPostgres_support_for_v10' 
9417a6d3 FindPostgreSQL: Add support for PG10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1635
 2018-01-09 09:45:45 -05:00
Brad King 9559eb7aa7 Merge branch 'FindPostgres_support_for_v10' into release-3.10 
Merge-request: !1635
 2018-01-09 09:44:56 -05:00
Egor Pugin 9417a6d322 FindPostgreSQL: Add support for PG10 2018-01-09 09:43:41 -05:00
Brad King ae89a6e110 Merge topic 'cpack_versions' 
e4153640 Cpack.cmake: Document some CPACK_* default values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1608
 2018-01-09 09:38:02 -05:00
Brad King 1906dd3e3d Merge topic 'COMPILE_FLAGS-clarify-sf-prop-documentation' 
118815f0 COMPILE_FLAGS: do not imply that the property is a list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1640
 2018-01-09 09:36:29 -05:00
Brad King 2cd2dd9cde Merge topic 'doc-CMAKE_SYSTEM_NAME-mode' 
edebf6f3 Help: note that CMAKE_SYSTEM_NAME is not set in script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1639
 2018-01-09 09:35:46 -05:00
Brad King 947d6de833 Merge topic 'doc-OUTPUT_NAME-clarify' 
6c5d3989 Help: fix documentation for OUTPUT_NAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1638
 2018-01-09 09:35:19 -05:00
Brad King 847110e6fa Merge topic 'vs10-target-generator-range-for' 
d09af946 VS: Modernize 'for' loops in cmVisualStudio10TargetGenerator to C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1617
 2018-01-09 09:34:08 -05:00
Brad King e2edc9280c Merge topic 'vs-ranged-for' 
92c7b526 VS: Use range-based 'for' loops in generator code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1616
 2018-01-09 09:33:33 -05:00
Brad King 5fbfa18fad Merge topic 'FindCUDA-deduplicate-c+std-host-flags' 
ff41a4b8 FindCUDA: de-duplicates C++11 flag when propagating host flags.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1628
 2018-01-09 09:26:51 -05:00
Brad King bc88329e5b Merge topic 'msvc2017-findcuda' 
fab1b432 FindCUDA: Update to properly find MSVC 2017 compiler tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1631
 2018-01-09 09:26:20 -05:00
Brad King 8a53242df9 Merge branch 'upstream-KWIML' into update-kwiml 
* upstream-KWIML:
  KWIML 2018-01-09 (9c2d6cae)
 2018-01-09 08:51:59 -05:00
KWIML Upstream 6e921648d2 KWIML 2018-01-09 (9c2d6cae) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit 9c2d6caecd8cd937b891009c681f90748df85dfd (master).

Upstream Shortlog
-----------------

Brad King (5):
      fc9d607a Use static_cast when compiling as C++
      ea9336bc Update copyright year
      7db8b884 Suppress MSVC static_cast warnings in verification and test code
      340af24d Update copyright year
      9c2d6cae Fix compilation on Borland C++ 5.8

Richard W.M. Jones (1):
      6fc81d88 abi.h: Update RISC-V support for revised macro names
 2018-01-09 08:51:58 -05:00
Craig Scott 89d1274630 Merge topic 'improve_generated_property_docs' 
11615b29 GENERATED: Improve the documentation of the GENERATED file property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1630
 2018-01-09 05:05:41 -05:00
Kitware Robot b9bada655e CMake Nightly Date Stamp 2018-01-09 00:01:07 -05:00
Robert Maynard 81868e6bad CUDA: Add cu as default source file extension 2018-01-08 16:16:52 -05:00
Beren Minor 1f4d7a0715 Help: Add references and backticks in LINK_FLAGS prop_tgt 2018-01-08 21:15:16 +01:00
Beren Minor 48f7e2d300 Unhardcode the CMAKE_CONFIGURATION_TYPES values 
This removes duplicated code for per-config variable initialization by
providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)`
function.

This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT`
and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does
the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every
`<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or
`CMAKE_BUILD_TYPE` for single-config generators.
 2018-01-08 21:15:14 +01:00
Ben Boeckel 118815f095 COMPILE_FLAGS: do not imply that the property is a list 
The "added to the list" language hinted that the property was
interpreted as a CMake list, but this is not correct. It is just a
string.
 2018-01-08 11:44:18 -05:00
Aaron Bray fab1b432eb FindCUDA: Update to properly find MSVC 2017 compiler tools 
An implementation that handles the different installation locations of
visual studio compiler tools
 2018-01-08 11:35:36 -05:00
Kyle Edwards 6c5d3989f7 Help: fix documentation for OUTPUT_NAME 
Fixes #17177.
 2018-01-08 11:33:05 -05:00
Brad King f7f34a46e6 Merge topic 'use_generator_is_multi_config' 
3c413e2a GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules
c267ea1c GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1627
 2018-01-08 11:14:16 -05:00
Kyle Edwards edebf6f31a Help: note that CMAKE_SYSTEM_NAME is not set in script mode 
Fixes #17109.
 2018-01-08 11:04:17 -05:00
Brad King f4a3143940 Merge topic 'execute_process_UTF8_keyword' 
8caec41e execute_process: Allow UTF-8 as a synonym for the UTF8 keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1623
 2018-01-08 10:44:47 -05:00
Brad King a3bba2a5ad Merge topic '17431-iphone-deployment-target' 
4017bf40 Darwin: Emit deployment target that matches the SDK
8f4663ff Xcode: rename embedded SDK query function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
 2018-01-08 09:58:11 -05:00
Robert Maynard 11615b297f GENERATED: Improve the documentation of the GENERATED file property 2018-01-08 09:12:33 -05:00
Kitware Robot 2c089d80de CMake Nightly Date Stamp 2018-01-08 00:01:04 -05:00
Kitware Robot e0560c1111 CMake Nightly Date Stamp 2018-01-07 00:01:05 -05:00
David Hirvonen ff41a4b817 FindCUDA: de-duplicates C++11 flag when propagating host flags. 2018-01-06 17:00:09 -05:00
Kitware Robot 0a87dbf568 CMake Nightly Date Stamp 2018-01-06 00:01:05 -05:00
Kitware Robot 91a1446d21 CMake Nightly Date Stamp 2018-01-05 00:01:37 -05:00
Craig Scott d88451568d Merge topic 'various-typos' 
3ab7bf82 Various typo fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1626
 2018-01-04 14:37:49 -05:00
Kitware Robot bc7fd08f23 CMake Nightly Date Stamp 2018-01-04 00:01:26 -05:00
Justin Goshi 2c1ecab64d server: Expand generator expressions for test info 2018-01-03 16:49:00 -08:00
Craig Scott 1642eb7749 Merge topic 'doxygen_verbatim_vars' 
1e6d1dd3 FindDoxygen: Add DOXYGEN_VERBATIM_VARS for quote prevention

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1624
 2018-01-03 15:17:27 -05:00
Luz Paz 3ab7bf8285 Various typo fixes 
Some are user-facing. Others are source comments.
 2018-01-04 06:52:01 +11:00
Kitware Robot 64b624f118 CMake Nightly Date Stamp 2018-01-03 00:01:33 -05:00
Craig Scott 1e6d1dd358 FindDoxygen: Add DOXYGEN_VERBATIM_VARS for quote prevention 
Each CMake variable listed in DOXYGEN_VERBATIM_VARS will not have any
automatic quoting applied to it when written to the Doxyfile.
 2018-01-03 07:59:59 +11:00
Kitware Robot 011f2de484 CMake Nightly Date Stamp 2018-01-02 00:01:09 -05:00
Kitware Robot 8111a6b665 CMake Nightly Date Stamp 2018-01-01 00:01:06 -05:00