Commit Graph
28539 Commits
Author SHA1 Message Date
Brad King d66081b546 Merge topic 'iwyu'
48cfb295 cmFortranParser: remove unnecessary typedef
90bb5f64 cmCommandArgumentParserHelper: remove unnecessary include
ab5f4e81 cmFortranParserImpl: remove unnecessary include
f8ed8bef testEncoding: use cmsys::ifstream
8647c6cd testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows only
21a6ed49 cmFileCommand: add <cm_curl.h> include
a2275bdd cmFileCommand: remove unnecessary friend declaration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !626
2017-03-30 08:58:26 -04:00
Brad King 2f359787f6 Merge topic 'cmake-file-install-symlink-on-nonexistng-path'
8e8f1118 handle non-existing symlink creation locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !642
2017-03-30 08:57:07 -04:00
Brad King 7bb8b38cce Merge topic '16742-swift-3.0'
77139e32 Swift: Simplify mixed test case to make it version agnostic
c03141c0 Swift: Default to Swift 3.0 with Xcode 8.3 and later

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !638
2017-03-30 08:52:37 -04:00
Kitware Robot f6d802b5bc CMake Nightly Date Stamp 2017-03-30 00:01:03 -04:00
Daniel Pfeifer 48cfb295a2 cmFortranParser: remove unnecessary typedef 2017-03-29 18:48:48 +02:00
Daniel Pfeifer 90bb5f64a4 cmCommandArgumentParserHelper: remove unnecessary include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer ab5f4e81f3 cmFortranParserImpl: remove unnecessary include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer 21a6ed49f2 cmFileCommand: add <cm_curl.h> include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer a2275bdd63 cmFileCommand: remove unnecessary friend declaration 2017-03-29 18:48:47 +02:00
Brad King 6ca509e7c6 Merge branch '16742-swift-3.0' into release 2017-03-29 10:40:59 -04:00
Betsy McPhail b070947dff Add 'DISABLED' test property
When this property is set, the test is skipped and its status is
automatically set to 'Not Run'.  A disabled test will not be counted in
the total number of tests and its completion status will be 'Disabled'.
2017-03-29 10:29:57 -04:00
Brad King d4a995750a Merge branch 'vs-rc-defines' into release 2017-03-29 09:24:29 -04:00
Brad King 6dc7262bf7 Merge topic 'vs-rc-defines'
fff34934 MSVC: Restore _DEBUG preprocessor definition in RC debug builds
79a91538 RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache
c77194ec VS: Honor preprocessor definitions in RC flags
1449f6f6 cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs
8a619e8c cmIDEOptions: Add GetDefines method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !640
2017-03-29 09:14:54 -04:00
Brad King 4a6a27ad85 Merge topic 'update-kwsys'
cdd2875a Merge branch 'upstream-KWSys' into update-kwsys
e9c5505b KWSys 2017-03-28 (34999b6a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !637
2017-03-29 09:12:41 -04:00
Brad King 2b9086d266 Merge topic 'vfproj-object-libs-fix'
7a411dfb VS: Fix OBJECT library support in Intel Fortran projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !636
2017-03-29 09:12:20 -04:00
Kitware Robot 3e4e6594da CMake Nightly Date Stamp 2017-03-29 00:01:07 -04:00
Domen Vrankar 8e8f1118b9 handle non-existing symlink creation locations 2017-03-29 00:22:52 +02:00
Gregor Jasny c03141c04c Swift: Default to Swift 3.0 with Xcode 8.3 and later
Xcode 8.3 has dropped support for Swift 2.3 so that compiler and
feature detection failed.

Closes #16742
2017-03-28 16:06:29 -04:00
Brad King c77194ec47 VS: Honor preprocessor definitions in RC flags
The VS generators use the C (or CXX) preprocessor definitions for
the Windows Resource Compiler tool.  This causes definitions parsed
out of `CMAKE_RC_FLAGS[_<CONFIG>]` variables to be dropped.  Fix
the implementation to preserve both.

Issue: #16745
2017-03-28 13:10:55 -04:00
Brad King 1449f6f63d cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs 2017-03-28 13:10:55 -04:00
Brad King 8a619e8c85 cmIDEOptions: Add GetDefines method 2017-03-28 13:10:55 -04:00
Christian Pfeiffer 7a411dfbf6 VS: Fix OBJECT library support in Intel Fortran projects
The `TargetExt` for `.vfproj` object libraries should be `.lib`
to match the `OutputFile` value.  Otherwise Visual Fortran raises
warnings:

    TargetPath(...) does not match the Library's OutputFile
    property value (...)
2017-03-28 10:34:26 -04:00
Brad King cdd2875ad2 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-03-28 (34999b6a)
2017-03-28 10:18:10 -04:00
Brad King 83199f8daf Merge topic 'InstallRequiredSystemLibraries-vs2017'
6eb609fd InstallRequiredSystemLibraries: Find VS 2017 redist directory
cf784d9f Add undocumented CMake language means to find VS 2017
082c0375 InstallRequiredSystemLibraries: Split VS 2017 search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !632
2017-03-28 10:14:59 -04:00
Brad King 4d97086848 Merge topic 'ninja-fix-sysconf-non-limit'
92fe00d3 Ninja: Fix command line limit when sysconf has no ARG_MAX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !633
2017-03-28 10:14:40 -04:00
Kitware Robot 21499431e0 CMake Nightly Date Stamp 2017-03-28 00:01:03 -04:00
Betsy McPhail 42c68aadf8 CTest: Improve 'Completion Status' reported to CDash for 'Not Run' tests
Previously, the completion status of not run tests was always set to
"Not Run".  Make it more descriptive.  This value is written to
`Test.xml` and then displayed as 'Test Details' in CDash.
2017-03-27 14:21:21 -04:00
Brad King 8c94f5085d Merge branch 'ninja-fix-sysconf-non-limit' into release 2017-03-27 13:42:30 -04:00
Christian Pfeiffer 92fe00d33c Ninja: Fix command line limit when sysconf has no ARG_MAX
The `sysconf(3)` manual explains that the return value can be `-1` for
limits if there is no definite limit.  Recognize this case and skip
using the value as a limit candidate.  Otherwise we use response files
unconditionally on such systems instead of checking other limits.

Fixes: #16740
2017-03-27 13:42:19 -04:00
Brad King 3ed87b7ee1 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-27 11:50:36 -04:00
Brad King cf784d9ff5 Add undocumented CMake language means to find VS 2017
Add a query to the `cmake_host_system_information` command to get
the location of a VS 2017 installation.  Leave it undocumented and
for internal use for now.
2017-03-27 11:43:01 -04:00
Brad King 341b42024b Merge topic 'cm-sys-stat'
e9fc7ff5 Add self-sufficient wrapper for <sys/stat.h>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !625
2017-03-27 09:05:13 -04:00
Brad King 0ff8f127fb Merge topic 'update-kwsys'
ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys
fda80fde KWSys 2017-03-24 (7e9f7b7b)
64490637 update-kwsys: Disable custom gitattributes during import
f1a55839 update-third-party: Add helper to disable custom gitattributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !624
2017-03-27 09:02:02 -04:00
Kitware Robot deec8919ba CMake Nightly Date Stamp 2017-03-27 00:01:02 -04:00
Kitware Robot d6ef21cf70 CMake Nightly Date Stamp 2017-03-26 00:01:02 -04:00
Kitware Robot 3ac205f7dc CMake Nightly Date Stamp 2017-03-25 00:01:03 -04:00
Daniel Pfeifer e9fc7ff505 Add self-sufficient wrapper for <sys/stat.h> 2017-03-24 22:58:25 +01:00
Brad King ea2a91a432 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-03-24 (7e9f7b7b)

Resolve conflicts in `.gitattributes` by integrating changes from both
sides.  Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway).  Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
2017-03-24 15:17:25 -04:00
Brad King 3b7f19a72f CMake 3.8.0-rc3 2017-03-24 08:47:13 -04:00
Brad King 8047bd6c0d Merge topic 'iwyu'
41ec3528 IWYU: use pragma export
72ea66b1 Autogen: include what you use
2a827b82 cmCPackGenerator: Move macros to bottom of file
bcd08aa3 cmCTest: Move macros to bottom of file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !619
2017-03-24 08:33:47 -04:00
Brad King 5bded841b4 Merge topic '16680-ios-bundle-resources'
b5189fda Apple: Add test for bundle resource layout
c51c2cfa Apple: Fix Resources location for all generators
060be58c Xcode: Properly handle Bundle Resources with more than one hierarchy level
484ccb0c Xcode: Properly handle non-resource Bundle files on iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !613
2017-03-24 08:32:41 -04:00
Kitware Robot 6cd8aa3c2a CMake Nightly Date Stamp 2017-03-24 00:01:07 -04:00
Daniel Pfeifer 41ec352832 IWYU: use pragma export 2017-03-23 23:38:46 +01:00
Daniel Pfeifer 72ea66b1cf Autogen: include what you use 2017-03-23 23:20:10 +01:00
Daniel Pfeifer 2a827b8244 cmCPackGenerator: Move macros to bottom of file
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
2017-03-23 23:08:57 +01:00
Daniel Pfeifer bcd08aa383 cmCTest: Move macros to bottom of file
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
2017-03-23 23:08:56 +01:00
Gregor Jasny c51c2cfac6 Apple: Fix Resources location for all generators
Issue: #16680
2017-03-23 16:43:55 +01:00
Brad King 677b3cbf28 Merge topic 'server-mode-fix-home-dir-check'
8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
2017-03-23 08:46:30 -04:00
Brad King 324d7f5a50 Merge branch 'server-mode-fix-home-dir-check' into release 2017-03-23 08:42:51 -04:00
Kitware Robot 82db83d2f1 CMake Nightly Date Stamp 2017-03-23 00:01:06 -04:00