Commit Graph

33845 Commits

Author SHA1 Message Date
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
Brad King
837d1359ee Merge topic 'update-kwsys'
451e9f93 Merge branch 'upstream-KWSys' into update-kwsys
572ac897 KWSys 2016-11-16 (a0c60eec)
2016-11-17 09:40:23 -05:00
Bill Hoffman
f0d50957b9 ctest: Improve output for -T memcheck
Show how many defects each test that had a defect produced.
Also tell the user where to find the full log files.
2016-11-17 09:38:06 -05:00
Kitware Robot
ab4a9a9826 CMake Nightly Date Stamp 2016-11-17 00:01:03 -05:00
Brad King
451e9f93be Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-11-16 (a0c60eec)
2016-11-16 13:27:07 -05:00
KWSys Upstream
572ac89773 KWSys 2016-11-16 (a0c60eec)
Code extracted from:

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

at commit a0c60eec7cdbe7b5d0196bfc5b69bd969fe8786f (master).

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

Brad King (2):
      818405fc Fix typo in clang-format script documentation
      a0c60eec Terminal: Add tmux to VT100 color support whitelist

Matt Leotta (1):
      6a642f72 SystemInformation: Skip loopback devices in search for FQDN
2016-11-16 13:27:06 -05:00
Brad King
095279bc94 Merge topic 'ccmake_fix_print_keys'
5ca4abb2 ccmake: Correctly display edit mode and associated keys
a9562eac ccmake: Add missing spaces to match the previous text length
2016-11-16 07:47:15 -05:00
Brad King
338e681c76 Merge topic 'test_vs_targets_file_reference'
c9560a9a Tests: Extend VS10Project to cover `.targets` file linking
2016-11-16 07:47:12 -05:00
Brad King
7849424173 Merge topic 'vs-suppress-upgrade-prompt'
7c8f7737 VS: Disable project upgrade prompt on VS 2013 and above
2016-11-16 07:47:09 -05:00
Brad King
e1c410dea3 Merge topic 'msvc-no-explicit-_DEBUG'
6d0b5ff6 MSVC: Do not define _DEBUG explicitly when using /MDd
2016-11-16 07:47:06 -05:00
Brad King
e57ee41370 Merge topic 'Empty_CTestTestfile_on_BUILD_TESTING_OFF'
ae4cfa8b Remove CTestTestfile.cmake when BUILD_TESTING is OFF
2016-11-16 07:47:02 -05:00
Brad King
2a663ebce1 Merge topic 'childEncoding'
f55fcdc8 CTest: Use UTF-8 encoding for output from Git
40bd42df Add Encoding option for RunChild, RunMakeCommand and RunProcess
595feb32 Windows: Encode child process output to internally-used encoding
96103972 Add cmProcessOutput class to be used for decoding text data
92c865b8 cmCTestBuildHandler: Use size_t in ProcessBuffer length argument
2016-11-16 07:46:48 -05:00
Brad King
b6da714af7 Merge topic 'armcc-response-file-flag'
d608e85c ARMCC: Fix flag used for response files
2016-11-16 07:45:54 -05:00
Kitware Robot
af46484bc4 CMake Nightly Date Stamp 2016-11-16 00:01:04 -05:00
Konstantin Podsvirov
da0e3f9096 install: Configurable DESTINATION for the cmake.m4 file
The DESTINATION changed from share/aclocal to ${CMAKE_XDGDATA_DIR}/aclocal.
2016-11-15 23:17:59 +03:00
Sylvain Joubert
5ca4abb27f ccmake: Correctly display edit mode and associated keys
Specific widgets can implement `PrintKeys` but their effects were hidden
by the main widget `PrintKeys`.  Fix this to give the user a better hint
about the edit mode status.

Closes: #13757
2016-11-15 11:01:01 -05:00
Sylvain Joubert
a9562eac3e ccmake: Add missing spaces to match the previous text length
There was a "glitch" leaving "it" on the screen
2016-11-15 11:00:58 -05:00
Soji Yamakawa
c9560a9a7b Tests: Extend VS10Project to cover .targets file linking
With VS generators for 2010 and above, passing a `.targets` file to
`target_link_libraries` is expected to generate content in the
`.vcxproj` file to import the targets file.  Add a test to cover this.
2016-11-15 10:47:15 -05:00
Erik Christensen
7c8f7737fd VS: Disable project upgrade prompt on VS 2013 and above
When opening projects in Visual Studio that specify an older toolset
version, a prompt is displayed the first time asking the user whether to
upgrade the projects.  This is meant for project files that are
maintained manually and updated through the IDE.  For CMake-generated
projects this does not make sense, so add content to tell VS not to
upgrade.
2016-11-15 10:40:55 -05:00
Brad King
6d0b5ff60d MSVC: Do not define _DEBUG explicitly when using /MDd
With the latter flag the compiler automatically defines `_DEBUG`:

  https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx

Closes: #16430
2016-11-15 10:24:06 -05:00
Sylvain Joubert
ae4cfa8b12 Remove CTestTestfile.cmake when BUILD_TESTING is OFF
When disabling BUILD_TESTING after a previous configure, the
`CTestTestfile.cmake` was left unchanged.  As a result, ctest would see
the tests while the user disabled testing.  Now when BUILD_TESTING is
OFF any existing `CTestTestfile.cmake` is removed ensuring an empty test
list.
2016-11-15 10:08:12 -05:00
Dāvis Mosāns
f55fcdc859 CTest: Use UTF-8 encoding for output from Git 2016-11-15 10:02:47 -05:00
Ben Boeckel
d608e85cfe ARMCC: Fix flag used for response files
ARMCC does not use the `@` sigil to indicate response files, but instead
the `--via=` flag. See the documentation here:

    http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0491h/CHDCIEGC.html

Fixes: #16425
2016-11-15 09:31:33 -05:00
Brad King
4790842612 Merge branch 'release' 2016-11-15 09:28:30 -05:00
Brad King
b6f1b1741d Merge topic 'add-SHA-3'
f636d1e7 Help: Add notes for topic 'add-SHA-3'
cb5dba8e Tests: Add SHA-3 algorithm coverage to CPack checksum test
a9fa6099 ExternalProject: Add support for SHA-3 algorithms
b4ffd26f ExternalData: Add support for SHA-3 algorithms
60939702 file: Add support for SHA-3 algorithms
92f95aed string: Add support for SHA-3 algorithms
c326209f cmCryptoHash: Add support for SHA-3 algorithms
979e8ba6 Help: De-duplicate and spell out supported hash algorithms
7a79f7e3 librhash: Activate SHA-3 implementation
87584b5e Merge branch 'upstream-librhash' into add-SHA-3
7fcbd47e librhash 2016-11-06 (de79828d)
c50c32a3 librhash: Update import script to add SHA-3 implementation
2016-11-15 09:26:16 -05:00
Brad King
2b7cc76440 Merge topic 'UseSWIG_USE_BUILD_SHARED_LIBS'
d5b56dd1 UseSWIG: Add USE_BUILD_SHARED_LIBS to accepted values for the TYPE arg
2016-11-15 09:26:13 -05:00
Brad King
06209c4ce2 Merge topic 'ExternalProject-fix-UPDATE_DISCONNECTED'
4deaa25f ExternalProject: Fix UPDATE_DISCONNECTED with empty update steps
2016-11-15 09:26:10 -05:00
Brad King
dadccc752e Merge topic 'cmake-server-fix-16423'
516a2cd3 server-mode: Reset GlobalGenerator before configure
2016-11-15 09:26:07 -05:00
Brad King
fcfddc67ed Merge topic 'cmake-server-fix-16422'
d0a707b3 server-mode: Prevent possible crash when watching directories
2016-11-15 09:25:58 -05:00
Brad King
06ee14f5be Merge topic 'FindBISON-fix-rebuild'
c087072e FindBISON: Do not rebuild every time when not VERBOSE
2016-11-15 09:25:54 -05:00
Brad King
4deaa25f46 ExternalProject: Fix UPDATE_DISCONNECTED with empty update steps
When `UPDATE_DISCONNECTED` is enabled the post-update steps
unconditionally depend on a `skip-update` step instead of `update`.
Make `skip-update` available whenever `UPDATE_DISCONNECTED` is enabled,
whether there is a real update step or not.

Closes: #16428
2016-11-15 08:45:04 -05:00
Kitware Robot
1d9934a56a CMake Nightly Date Stamp 2016-11-15 00:01:04 -05:00
Dāvis Mosāns
40bd42dfbc Add Encoding option for RunChild, RunMakeCommand and RunProcess 2016-11-15 01:00:46 +02:00
Brad King
f7c5e970a0 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-14 14:39:50 -05:00
Brad King
d95e6dff3c 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-14 14:29:18 -05:00