Commit Graph

33880 Commits

Author SHA1 Message Date
Rolf Eike Beer
703d194338 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
The version of CMake required to build CMake is now new enough to have
that variable.
2016-11-28 16:38:42 -05:00
Brad King
a6fe714eaa Merge branch 'release' 2016-11-22 10:29:26 -05:00
Brad King
74a0359ee6 Merge topic 'eclipse-subprojects'
f84a3acd Eclipse: Fix indexer for subprojects
2016-11-22 08:41:07 -05:00
Brad King
2420ce88f1 Merge topic 'imported-interface-no-system'
46005251 Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries
2016-11-22 08:41:03 -05:00
Brad King
de758cfaa1 Merge topic 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT'
df9fea7f Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable
2016-11-22 08:40:59 -05:00
Kitware Robot
0ffc4e735a CMake Nightly Date Stamp 2016-11-22 00:01:03 -05:00
Adam Weisi
f84a3acd71 Eclipse: Fix indexer for subprojects
Using `add_subdirectory(source_dir binary_dir)` with `source_dir` not a
subdirectory needs to add a `[Subprojects]` entry to the source path in
Eclipse.  The Eclipse indexer seems to use those entries as reference to
index source files.

Closes: #15984
2016-11-21 15:05:14 -05:00
Brad King
47dd761379 Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into release 2016-11-21 11:52:32 -05:00
Brad King
df9fea7f49 Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable
This variable documentation was simply missing.

Suggested-by: Craig Scott <craig.scott@crascit.com>
2016-11-21 11:52:00 -05:00
Brad King
460052516f Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries
Imported INTERFACE libraries can specify include directories via
`INTERFACE_INCLUDE_DIRECTORIES` so the default behavior of treating them
as system include directories applies.  Allow users to turn this off by
setting `NO_SYSTEM_FROM_IMPORTED` on such targets.

Closes: #16443
2016-11-21 11:42:01 -05:00
Brad King
acde2c4a53 Merge topic 'doc-imported-interface-libname'
b3193996 Help: Mention IMPORTED_LIBNAME_* in interface library property whitelist
2016-11-21 11:41:29 -05:00
Brad King
b3193996bd Help: Mention IMPORTED_LIBNAME_* in interface library property whitelist
This property was added by commit 09cda9d5 (Allow imported INTERFACE
libraries to specify a link library name, 2016-11-03) and is in the
implementation's whitelist.  Add it to the documentation too.
2016-11-21 10:41:40 -05:00
Brad King
95cfb54579 Merge topic 'capture-clang-tidy-errors'
80ebc55a cmake: Report if the <LANG>_CLANG_TIDY tool exits with non-zero
ce1abfa4 cmake: If ldd for LINK_WHAT_YOU_USE fails to run then report why
44de6157 cmake: Comment why we ignore the include-what-you-use return code
2016-11-21 10:02:02 -05:00
Brad King
45d74e9ad3 Merge topic 'update-kwsys'
4775a99f Merge branch 'upstream-KWSys' into update-kwsys
0a56e6fe KWSys 2016-11-18 (2a3f6f6b)
2016-11-21 10:01:58 -05:00
Kitware Robot
1528831bb1 CMake Nightly Date Stamp 2016-11-21 00:01:03 -05:00
Kitware Robot
029b209612 CMake Nightly Date Stamp 2016-11-20 00:01:08 -05:00
Kitware Robot
1748b60a47 CMake Nightly Date Stamp 2016-11-19 00:01:04 -05:00
Brad King
22de879289 Merge branch 'release' 2016-11-18 11:44:37 -05:00
Brad King
37966a5799 Merge branch 'vs-15-preview-5' into release 2016-11-18 11:43:43 -05:00
Brad King
5562d678a9 Merge branch 'release' 2016-11-18 10:05:42 -05:00
Brad King
9fd9fd9861 Merge branch 'backport-android-info-variables' into release 2016-11-18 10:05:00 -05:00
Brad King
cdad11c734 Merge topic 'backport-android-info-variables'
ea8eba0b Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
0d3eb139 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
236d6244 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
2016-11-18 10:04:07 -05:00
Brad King
ea8eba0bbf Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
Expose the binutils' machine name (typically used as a prefix on the
tool names) publicly.  This is expected to match the `gcc -dumpmachine`
value.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 10:03:15 -05:00
Brad King
0d3eb139e1 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
The NDK provides prebuilt toolchain files in directories named for the
host architecture.  The NDK build system calls this `HOST_TAG`.
Expose the value publicly for use by clients that need to pass it
to external tools.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 10:03:07 -05:00
Brad King
236d6244a0 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
When this variable is not set by the user or toolchain file, set it to
the default selected.  This will be useful for client code that needs to
pass the value to an external tool that needs to find the same toolchain
in the NDK.  Leave it empty for a standalone toolchain.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 10:02:57 -05:00
Brad King
43f292ab34 Merge topic 'backport-android-info-variables'
78db7090 Help: Drop release notes for backported Android variables
2016-11-18 09:59:54 -05:00
Brad King
78db709062 Help: Drop release notes for backported Android variables
These do not need to be called out in the 3.7 release notes because
they are part of the new Android support feature already covered.
2016-11-18 09:58:24 -05:00
Brad King
8ee3909ea6 Merge topic 'backport-android-info-variables'
e3cd5599 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
5c2100e5 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
790c0a89 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
2016-11-18 09:54:21 -05:00
Brad King
e3cd5599a2 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
Expose the binutils' machine name (typically used as a prefix on the
tool names) publicly.  This is expected to match the `gcc -dumpmachine`
value.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 09:51:18 -05:00
Brad King
5c2100e5c0 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
The NDK provides prebuilt toolchain files in directories named for the
host architecture.  The NDK build system calls this `HOST_TAG`.
Expose the value publicly for use by clients that need to pass it
to external tools.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 09:51:18 -05:00
Brad King
790c0a89de Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
When this variable is not set by the user or toolchain file, set it to
the default selected.  This will be useful for client code that needs to
pass the value to an external tool that needs to find the same toolchain
in the NDK.  Leave it empty for a standalone toolchain.

Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-11-18 09:51:17 -05:00
Brad King
80ebc55a7c cmake: Report if the <LANG>_CLANG_TIDY tool exits with non-zero
When using `<LANG>_CLANG_TIDY` our internal launcher for the tool must
capture its return code and stderr and report them on failure.
Otherwise incorrect command lines silently fail.

Closes: #16435
2016-11-18 09:43:22 -05:00
Brad King
ce1abfa414 cmake: If ldd for LINK_WHAT_YOU_USE fails to run then report why 2016-11-18 09:43:22 -05:00
Brad King
44de615781 cmake: Comment why we ignore the include-what-you-use return code
The include-what-you-use tool always returns non-zero to indicate that
it did not actually produce an object file as Clang would from the same
command line.  Add a comment explaining that this is why we ignore its
return code.  Also update our `pseudo_iwyu` test suite tool to always
exit with an error too.
2016-11-18 09:43:19 -05:00
Brad King
4775a99f61 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-11-18 (2a3f6f6b)
2016-11-18 09:13:40 -05:00
KWSys Upstream
0a56e6fe35 KWSys 2016-11-18 (2a3f6f6b)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 2a3f6f6b9098d10afb05e894faf262efa22f38b8 (master).

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

Dāvis Mosāns (2):
      a7e82be0 ConsoleBuf: Expose Manager ConsoleBuf to be accessible
      2a3f6f6b ConsoleBuf: Add Manager convenience method for UTF-8 pipes
2016-11-18 09:13:39 -05:00
Brad King
c9d142c4e9 Merge topic 'auto_project_regeneration'
427b6da9 VS: Teach `cmake --build` to reconfigure if needed before building
2016-11-18 09:10:33 -05:00
Brad King
2469cb5aae Merge topic 'tolerate-removed-cache'
25b6e7b7 Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/
2016-11-18 09:10:29 -05:00
Brad King
6e72c8d491 Merge topic 'ExternalProject-cmd-poisoning'
02445138 ExternalProject: Do not trip over pre-existing 'cmd' variable
2016-11-18 09:10:26 -05:00
Brad King
8f5a442408 Merge topic 'update-prebuilt-openssl'
2dafeacb Utilities/Release: Update to openssl-1.0.2j
2016-11-18 09:10:14 -05:00
Brad King
1725477221 Merge topic 'xcode-add-override-keyword'
c0e223cd Xcode: Add override keyword to suppress warnings
2016-11-18 09:10:08 -05:00
Kitware Robot
706d05e71a CMake Nightly Date Stamp 2016-11-18 00:01:04 -05:00
Gregor Jasny
c0e223cd2a Xcode: Add override keyword to suppress warnings 2016-11-17 22:39:46 +01:00
Brad King
2dafeacb75 Utilities/Release: Update to openssl-1.0.2j
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2016-11-17 16:12:36 -05:00
Yves Frederix
427b6da9e5 VS: Teach cmake --build to reconfigure if needed before building
Visual Studio's build system does not cleanly handle itself being
re-generated during the build.  Teach `cmake --build` to check whether
the build system needs to be re-generated before launching the native
build tool.
2016-11-17 13:53:42 -05:00
Karsten Sperling
0244513838 ExternalProject: Do not trip over pre-existing 'cmd' variable
Callers of `_ep_get_build_command` do not initialize the output variable
they pass and expect the function to unconditionally set it.  Revise the
function to not check its own output variable.  Otherwise if a `cmd`
variable happens to be set when `ExternalProject_Add` is called then it
will be erroneously used as the default `BUILD`, `TEST`, and `INSTALL`
command.
2016-11-17 13:40:29 -05:00
Brad King
25b6e7b710 Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/
Users or scripts commonly remove or replace `CMakeCache.txt` without
also removing `CMakeFiles/`.  In this case the information saved in the
cache from platform information initialization is missing, so we need to
re-initialize it.  In such a case, remove the platform information
directory so that re-initialization will occur and restore needed
information to the cache.

Closes: #14820
2016-11-17 10:29:58 -05:00
Brad King
0e9634d2c9 Merge topic 'android-info-variables'
f7c5e970 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
d95e6dff Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
3d42a72b Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
2016-11-17 09:40:32 -05:00
Brad King
e67a59b00d Merge topic 'cmake-m4-destination'
da0e3f90 install: Configurable DESTINATION for the cmake.m4 file
2016-11-17 09:40:29 -05:00
Brad King
8dd3c319c9 Merge topic 'improve_ctest_memcheck_output'
f0d50957 ctest: Improve output for `-T memcheck`
2016-11-17 09:40:26 -05:00