Commit Graph

35392 Commits

Author SHA1 Message Date
Gregor Jasny 013ffe76e7 cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternal 2017-03-30 22:24:54 +02:00
Gregor Jasny 32e9d0ca23 cmGeneratorTarget: Use enum to describe bundle directory query level 2017-03-30 22:24:54 +02:00
Brad King 3e2f6bd962 Merge branch 'release' 2017-03-30 10:28:03 -04:00
Brad King 9e32b88784 CMake 3.8.0-rc4 v3.8.0-rc4 2017-03-30 09:16:41 -04:00
Brad King c26885066b Merge branch 'release' 2017-03-30 09:14:12 -04:00
Brad King cb0f3cbb8e Merge topic '10749-aix-version'
01a8a201 AIX: Properly detect host system version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !645
2017-03-30 09:05:06 -04:00
Brad King 1cc918a770 Merge topic 'ctest-disable-tests'
b070947d Add 'DISABLED' test property
42c68aad CTest: Improve 'Completion Status' reported to CDash for 'Not Run' tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !571
2017-03-30 09:01:06 -04:00
Brad King a820327d1a Merge topic 'sdcc-compiler-id'
5695558f SDCC: Fix identification of current sdcc compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !644
2017-03-30 08:59:05 -04:00
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 7a6ab42f47 Merge topic 'FindBoost-1.64-deps'
556d98da FindBoost: Update 1.64 dependencies using 1.64 beta1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !629
2017-03-30 08:55:19 -04:00
Brad King 18eeed4194 Merge branch 'FindBoost-1.64-deps' into release 2017-03-30 08:55:01 -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
Roger Leigh 556d98da3b FindBoost: Update 1.64 dependencies using 1.64 beta1 2017-03-30 11:43:13 +01:00
Kitware Robot f6d802b5bc CMake Nightly Date Stamp 2017-03-30 00:01:03 -04:00
Gregor Jasny 01a8a201a7 AIX: Properly detect host system version
CMakeDetermineSystem.cmake uses "uname -r" to get
CMAKE_HOST_SYSTEM_VERSION on AIX. AIX uses "uname -v" for the
major version and "uname -r" for the minor version.

Thanks to Chris Taylor for the suggested patch.

Closes #10749
2017-03-29 21:20:23 +02:00
Brad King cb4e731347 Merge branch 'sdcc-compiler-id' into release 2017-03-29 13:22:06 -04:00
Brad King 5695558f4a SDCC: Fix identification of current sdcc compiler
The sdcc compiler no longer defines the `SDCC` preprocessor macro.
Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are
defined.  Use them instead if defined.

Issue: #16746
2017-03-29 13:21:49 -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 f8ed8bef84 testEncoding: use cmsys::ifstream 2017-03-29 18:48:47 +02:00
Daniel Pfeifer 8647c6cd68 testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows only 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
Gregor Jasny 77139e320c Swift: Simplify mixed test case to make it version agnostic
Issue: #16742
2017-03-29 15:36:05 +02:00
Brad King 6a5a214f43 Merge branch 'release' 2017-03-29 09:25:28 -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
Brad King ece20f7ae8 Merge topic 'sphinx-cmake-theme'
62b85c94 Utilities/Sphinx: Use brighter colors for html theme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !641
2017-03-29 09:11:38 -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
Matthew Woehlke 62b85c9406 Utilities/Sphinx: Use brighter colors for html theme
Set Sphinx `html_theme_options` to give the generated documentation a
brighter and softer look than the default colors.
2017-03-28 13:38:42 -04:00
Brad King fff34934e7 MSVC: Restore _DEBUG preprocessor definition in RC debug builds
In commit v3.8.0-rc1~304^2 (MSVC: Do not define _DEBUG explicitly when
using /MDd, 2016-11-15) we removed the `_DEBUG` preprocessor definition
from MSVC C and C++ flags because the `cl` compiler automatically
defines it in Debug builds anyway.  However, the VS generators propagate
C preprocessor definitions to the RC (Windows Resource Compiler) tool.
This means that we used to explicitly define `_DEBUG` for RC debug
builds.  Therefore existing project code may expect the definition to be
there even though the `rc` compiler itself does not implicitly define
`_DEBUG` in debug builds.

Add the `_DEBUG` flag to the default `CMAKE_RC_FLAGS_DEBUG` instead
to restore this definition for RC debug builds.  This also makes it
available consistently in VS, Ninja, and Makefile generators.

Fixes: #16745
2017-03-28 13:10:56 -04:00
Brad King 79a915383f RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache 2017-03-28 13:10:55 -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
KWSys Upstream e9c5505bf9 KWSys 2017-03-28 (34999b6a)
Code extracted from:

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

at commit 34999b6ab815d1456818f4517338a15be7f89ea0 (master).

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

Daniel Pfeifer (1):
      6f43bcef FStream: Make (i|o)fstream::is_open function public
2017-03-28 10:18:09 -04:00
Brad King cc4fbda1a9 Merge branch 'release' 2017-03-28 10:17:42 -04:00
Brad King 3d3eacbb61 Merge topic 'libarchive-backport-zip-dir-fix'
9dfccdc2 libarchive: backport zip directory recognition fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !634
2017-03-28 10:15:19 -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