mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
42,291 Commits 2 Branches 401 Tags
00ba28ffd03a9a0cf00d78001573bc5cc045ee72
Commit Graph

42291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitaly Stakhovsky 00ba28ffd0 cmMakefile::GetRequiredDefinition: return const std::string& 2019-02-07 07:35:16 -05:00
Brad King 0741eda246 Merge topic 'mingw-ar-suffix' 
42825fc220 MinGW: Fix locating BinUtils when compiler has a suffix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2924
 2019-02-07 06:55:53 -05:00
Brad King 982e6e7775 Merge topic 'findcups' 
dd45f23b01 FindCups: add imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2917
 2019-02-07 06:55:12 -05:00
Brad King 450a1904d5 Merge topic 'test-FortranModules-tweak' 
562ea5d0e2 Tests: Add a way to configure custom options for FortranModules test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2926
 2019-02-07 06:54:31 -05:00
Brad King 555b3c11ec Merge branch 'release-3.14' 2019-02-07 06:53:32 -05:00
Brad King 6252a7ff61 Merge topic 'cpack-ifw-error-wording' 
60a8d4c5f4 CPack/IFW: Correct wording in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2928
 2019-02-07 06:52:46 -05:00
Brad King 1e2e12889b Merge branch 'cpack-ifw-error-wording' into release-3.14 
Merge-request: !2928
v3.14.0-rc1 		2019-02-07 06:51:28 -05:00
Joachim Wuttke (o) 60a8d4c5f4 CPack/IFW: Correct wording in error message 2019-02-07 06:51:15 -05:00
Brad King ebb6b3a2da Merge topic 'FindHDF5-cleanup' 
d3d9e6b760 FindHDF5: Modernize formatting of variable documentation
acbd69c219 FindHDF5: Use execute_process instead of exec_program

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2916
 2019-02-07 06:49:56 -05:00
Brad King 6383dc398a Merge branch 'FindHDF5-cleanup' into release-3.14 
Merge-request: !2916
 2019-02-07 06:48:52 -05:00
Michael Hirsch, Ph.D d3d9e6b760 FindHDF5: Modernize formatting of variable documentation 2019-02-07 06:47:07 -05:00
Michael Hirsch, Ph.D acbd69c219 FindHDF5: Use execute_process instead of exec_program 2019-02-07 06:47:07 -05:00
Brad King 7df10748e2 Merge topic 'xcode-stdlib-flags' 
8af334f5ba Xcode: Derive stdlib from CXX flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2919
 2019-02-07 06:45:42 -05:00
Brad King f657bcbd48 Merge branch 'xcode-stdlib-flags' into release-3.14 
Merge-request: !2919
 2019-02-07 06:44:19 -05:00
Gregor Jasny 8af334f5ba Xcode: Derive stdlib from CXX flags 
Closes: #18396
 2019-02-07 06:43:51 -05:00
Brad King f60ec9e63a Merge topic 'vs-csharp-nowarn-numbers' 
822697996e VS: Fix nowarn compiler option to accept warning numbers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
 2019-02-07 06:42:30 -05:00
Brad King f835526d8f Merge branch 'vs-csharp-nowarn-numbers' into release-3.14 
Merge-request: !2923
 2019-02-07 06:41:22 -05:00
Wil Stark 822697996e VS: Fix nowarn compiler option to accept warning numbers. 
Warning disables are transferred to the VS IDE `<NoWarn>` node.

Fixes: #18878
 2019-02-07 06:39:45 -05:00
Kitware Robot c2ffcb3aab CMake Nightly Date Stamp 2019-02-07 00:01:07 -05:00
Regina Pfeifer 42825fc220 MinGW: Fix locating BinUtils when compiler has a suffix 
While all executables from a mingw toolchain share a common prefix,
only the ones provided with the compiler have a suffix, the binutils
do not.

Fixes: #18879
 2019-02-06 17:43:55 +01:00
Patrick Gansterer dd45f23b01 FindCups: add imported target 2019-02-06 11:20:57 -05:00
Brad King 562ea5d0e2 Tests: Add a way to configure custom options for FortranModules test 
Read an undocumented cache entry to allow some CI builds to configure
this test in a special way.
 2019-02-06 10:17:02 -05:00
Brad King 062cfd991f Begin post-3.14 development 2019-02-06 10:11:11 -05:00
Brad King e97a4bed4f Merge branch 'release-3.14' 2019-02-06 10:09:19 -05:00
Brad King bf1c2a2593 CMake 3.14.0-rc1 version update 2019-02-06 10:08:35 -05:00
Brad King 0b882e4213 Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2019-02-06 10:06:25 -05:00
Brad King 6f23321d40 Merge topic 'doc-3.14-relnotes' 
aa9161fd57 Help: Organize and revise 3.14 release notes
0d1a9282c4 Help: Consolidate 3.14 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2925
 2019-02-06 10:04:49 -05:00
Brad King aa9161fd57 Help: Organize and revise 3.14 release notes 
Add section headers similar to the 3.13 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2019-02-06 09:52:35 -05:00
Brad King 0d1a9282c4 Help: Consolidate 3.14 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.14.rst`.
 2019-02-06 09:16:59 -05:00
Brad King d423192062 Merge topic 'deprecate-xcode-4' 
75a75d2754 Xcode: deprecate support for Xcode 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2922
 2019-02-06 06:54:52 -05:00
Gregor Jasny 75a75d2754 Xcode: deprecate support for Xcode 4 2019-02-06 06:53:42 -05:00
Brad King d6729505cb Merge topic 'relax_CUDA_RESOLVE_DEVICE_SYMBOLS_constraints' 
850ef90a66 CUDA: Honor CUDA_RESOLVE_DEVICE_SYMBOLS for more target types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2900
 2019-02-06 06:51:30 -05:00
Brad King 4400ac07f7 Merge topic 'autogen_same_name_different_extension' 
a28caabf45 Autogen: AUTOMOC support for files with the same name but different extensions
1f802295f2 Autogen: Extend the SameName test with same name but different extension files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2920
 2019-02-06 06:50:36 -05:00
Kitware Robot 3a2387bce7 CMake Nightly Date Stamp 2019-02-06 00:01:07 -05:00
Robert Maynard 850ef90a66 CUDA: Honor CUDA_RESOLVE_DEVICE_SYMBOLS for more target types 
`CUDA_RESOLVE_DEVICE_SYMBOLS` can be used with shared, module, and
executable target types.  This relaxation is to allow for better
interoperability with linkers that automatically do CUDA device symbol
resolution and have no way to disable it.
 2019-02-05 11:09:48 -05:00
Sebastian Holtermann a28caabf45 Autogen: AUTOMOC support for files with the same name but different extensions 
This adds support for AUTOMOC to moc header files with the same but different
extensions (e.g `obj.h`, `obj.hpp`, `obj.hxx`).  If a moc file would appear
multiple times in `mocs_compilation.cpp`, a number suffix is appended
to the name to make it unique.

Closes #14489
 2019-02-05 15:51:53 +01:00
Sebastian Holtermann 1f802295f2 Autogen: Extend the SameName test with same name but different extension files 2019-02-05 15:51:53 +01:00
Brad King f47d980f73 Merge topic 'update-kwsys' 
9ddbf4c6e6 Merge branch 'upstream-KWSys' into update-kwsys
8372c05472 KWSys 2019-02-05 (65802a20)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2918
 2019-02-05 07:49:07 -05:00
Brad King ab01ce91ee Merge topic 'autogen_single_all_sources_iteration' 
b6cf086267 Autogen: Iterate over makefile sources only once
ed0fa784eb cmSystemTools: Let `GetFileFormat` accept a `std::stding const&`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2909
 2019-02-05 07:47:14 -05:00
Brad King c6d679f0d9 Merge topic 'vs-fortran-target-check' 
d3d2c3cd49 VS: Fix Fortran target type selection when linking C++ targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2913
 2019-02-05 07:36:36 -05:00
Brad King c03072f2f7 Merge topic '17870-iphone-friendly-cmake' 
e8ee8cab97 Xcode: Completely disable code signing for compiler id detection
11da882a12 Apple: Introduce separate system name for iOS, tvOS, and watchOS
36cf44a7a3 Tests: Isolate RunCMake.XcodeProject per-device cases from host arch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2392
 2019-02-05 07:33:04 -05:00
Brad King 25e616862d Merge topic 'swift-xcode-10.2' 
96dece6dc1 Xcode: Update default Swift language version for Xcode 10.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2912
 2019-02-05 07:29:59 -05:00
Brad King 9ddbf4c6e6 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2019-02-05 (65802a20)
 2019-02-05 07:20:34 -05:00
KWSys Upstream 8372c05472 KWSys 2019-02-05 (65802a20) 
Code extracted from:

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

at commit 65802a20ec4b9a774518151c3f8772e082163601 (master).

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

Nicolae Vartolomei (1):
      d1536b02 macOS: Better approximation for AvailablePhysicalMemory
 2019-02-05 07:20:29 -05:00
Kitware Robot 762a41fd19 CMake Nightly Date Stamp 2019-02-05 00:01:05 -05:00
Brad King d3d2c3cd49 VS: Fix Fortran target type selection when linking C++ targets 
Since commit 2c9f35789d (VS: Decide project type by linker lang as
fallback, 2017-03-30, v3.9.0-rc1~340^2) we consider the linker language
when detecting whether to generate a `.vfproj` or `.vcxproj` file.
However, this could cause C-only projects to become `.vfproj` files if
they link to Fortran projects.  Instead we should consider only the
`LINKER_LANGUAGE` property on the target itself.  This approach is
already used for CSharp.  It allows project code to specify the project
file type for a target with no sources but does not allow linked targets
to affect it.

Fixes: #18687
 2019-02-04 14:13:46 -05:00
Brad King 96dece6dc1 Xcode: Update default Swift language version for Xcode 10.2 
Xcode 10.2 no longer supports Swift language versions before 4.0.

Fixes: #18871
 2019-02-04 13:26:10 -05:00
Gregor Jasny e8ee8cab97 Xcode: Completely disable code signing for compiler id detection 
Issue: #17870
 2019-02-04 09:03:35 -05:00
Gregor Jasny 11da882a12 Apple: Introduce separate system name for iOS, tvOS, and watchOS 
- Remove code signing requirements for non-macOS
- Do not set deployment target for non-macOS
- Build static library for compiler feature detection for non-macOS
- Use framework to run CompilerId tests for watchOS
- Port tests to new SDK handling
- Add new Apple cross-compiling section to toolchain documentation

Closes: #17870
 2019-02-04 09:03:35 -05:00
Brad King 36cf44a7a3 Tests: Isolate RunCMake.XcodeProject per-device cases from host arch 
Run all host cases before per-device cases.  Do not expose the host
`CMAKE_OSX_ARCHITECTURES` environment value to the per-device tests.
 2019-02-04 09:02:47 -05:00