This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 0789a8be08005d076568695ff3f85fb47f94620a (commit)
via 80e0ef4082d999e629688e9a6639ac498634b5ed (commit)
via 67d5593efaecc706bf5f0bac5e34cb7a09227e10 (commit)
via 252c2f5ee20d3c4dcd44c00d218a4d4e32c1932c (commit)
via 300979e7889b34d61803675c560fe450c7404447 (commit)
via 46f48467c5177d0dc6e99b03447ba8c813108f35 (commit)
via 9557b403f521d4f537bbedb9ba00836fb7ebb70c (commit)
via 845f5e3c51809ec4967fd4940985b221c3918e95 (commit)
via a6b39a5adf443d1fbe2e2907ef881a4f51a77475 (commit)
via 8b410453938358b1e035fc01d55f3cd1f737b7b6 (commit)
via e8f0385f41e75d98b6d3f14f785747c2decb1cd4 (commit)
via 3c515e192211a787bd35b99eb839cccd7cc60635 (commit)
via 75accaae8b6a691b031f268f8afc368791a53030 (commit)
from 1867856f6adb5d9743cfa28e7b10809e23dd0d51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0789a8be08005d076568695ff3f85fb47f94620a
commit 0789a8be08005d076568695ff3f85fb47f94620a
Merge: 80e0ef4 3c515e1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:54:04 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:54:09 2017 -0400
Merge topic 'extra-fphsa-space'
3c515e19 FPHSA: remove extra space
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !843
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80e0ef4082d999e629688e9a6639ac498634b5ed
commit 80e0ef4082d999e629688e9a6639ac498634b5ed
Merge: 67d5593 75accaa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:53:29 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:53:32 2017 -0400
Merge topic 'GNU-FindBinUtils-patterns'
75accaae GCC: more patterns for ar/ranlib
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !838
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67d5593efaecc706bf5f0bac5e34cb7a09227e10
commit 67d5593efaecc706bf5f0bac5e34cb7a09227e10
Merge: 252c2f5 9557b40
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:52:39 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:52:42 2017 -0400
Merge topic 'mingw-w64-compile'
9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !837
diff --cc Source/cmFileCommand.cxx
index 2c25e9b,dc97e37..ff6e2b7
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@@ -37,13 -40,12 +37,17 @@@
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmCurl.h"
#include "cmFileLockResult.h"
+#include "cm_curl.h"
+#endif
+
+#if defined(CMAKE_USE_ELF_PARSER)
+#include "cmELF.h"
#endif
+ #if defined(_WIN32)
+ #include <windows.h>
+ #endif
+
class cmSystemToolsFileTime;
// Table of permissions flags.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=252c2f5ee20d3c4dcd44c00d218a4d4e32c1932c
commit 252c2f5ee20d3c4dcd44c00d218a4d4e32c1932c
Merge: 300979e a6b39a5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:51:48 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:51:51 2017 -0400
Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'
a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !844
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=300979e7889b34d61803675c560fe450c7404447
commit 300979e7889b34d61803675c560fe450c7404447
Merge: 46f4846 8b41045
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:48:04 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:49:05 2017 -0400
Merge topic 'FindOpenSSL-crypto-only'
8b410453 FindOpenSSL: Restore support for crypto-only result
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !846
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46f48467c5177d0dc6e99b03447ba8c813108f35
commit 46f48467c5177d0dc6e99b03447ba8c813108f35
Merge: 1867856 e8f0385
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 16 13:47:43 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 16 09:47:50 2017 -0400
Merge topic 'FindDevIL-compat'
e8f0385f FindDevIL: Restore IL_FOUND result variable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !845
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9557b403f521d4f537bbedb9ba00836fb7ebb70c
commit 9557b403f521d4f537bbedb9ba00836fb7ebb70c
Author: Aleksey Chernov <valex...@gmail.com>
AuthorDate: Sat May 13 19:14:55 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 15 14:25:37 2017 -0400
cmFileCommand: Fix build on mingw-w64
Include header needed for `CP_ACP`.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 91cecb3..dc97e37 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -42,6 +42,10 @@
#include "cmFileLockResult.h"
#endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
class cmSystemToolsFileTime;
// Table of permissions flags.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=845f5e3c51809ec4967fd4940985b221c3918e95
commit 845f5e3c51809ec4967fd4940985b221c3918e95
Author: Aleksey Chernov <valex...@gmail.com>
AuthorDate: Sat May 13 19:14:55 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 15 11:13:07 2017 -0400
bootstrap: fix build on mingw-w64
Define the default code page for EncodingCXX too.
diff --git a/bootstrap b/bootstrap
index 8063edb..b1528cb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1419,6 +1419,7 @@ fi
cmake_c_flags_String="-DKWSYS_STRING_C"
if ${cmake_system_mingw}; then
cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP"
+ cmake_cxx_flags_EncodingCXX="${cmake_c_flags_EncodingC}"
cmake_cxx_flags_cmProcessOutput="${cmake_c_flags_EncodingC}"
fi
cmake_cxx_flags_SystemTools="
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6b39a5adf443d1fbe2e2907ef881a4f51a77475
commit a6b39a5adf443d1fbe2e2907ef881a4f51a77475
Author: Michael Stürmer <michael.stuer...@schaeffler.com>
AuthorDate: Mon May 15 15:37:10 2017 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 15 11:02:15 2017 -0400
VS: Fix debugging of C++ executables if CSharp is enabled
Fixes: #16867
diff --git a/Modules/CMakeCSharpInformation.cmake
b/Modules/CMakeCSharpInformation.cmake
index dc775bd..cd86016 100644
--- a/Modules/CMakeCSharpInformation.cmake
+++ b/Modules/CMakeCSharpInformation.cmake
@@ -68,38 +68,38 @@ if(CMAKE_CSharp_STANDARD_LIBRARIES_INIT)
mark_as_advanced(CMAKE_CSharp_STANDARD_LIBRARIES)
endif()
-# set missing flags (if they do not exist). This is needed in the
+# set missing flags (if they are not defined). This is needed in the
# unlikely case that you have only C# and no C/C++ targets in your
# project.
-if(NOT EXISTS CMAKE_SHARED_LINKER_FLAGS)
+if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS)
set(CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_SHARED_LINKER_FLAGS_DEBUG)
+if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_DEBUG)
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_SHARED_LINKER_FLAGS_RELEASE)
+if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_RELEASE)
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL)
+if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL)
set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO)
+if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO)
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_EXE_LINKER_FLAGS)
+if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_EXE_LINKER_FLAGS_DEBUG)
+if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_DEBUG)
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_EXE_LINKER_FLAGS_RELEASE)
+if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_RELEASE)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_EXE_LINKER_FLAGS_MINSIZEREL)
+if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_MINSIZEREL)
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)
endif()
-if(NOT EXISTS CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO)
+if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO)
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b410453938358b1e035fc01d55f3cd1f737b7b6
commit 8b410453938358b1e035fc01d55f3cd1f737b7b6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 15 10:05:44 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 15 10:12:46 2017 -0400
FindOpenSSL: Restore support for crypto-only result
Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and
SSL libraries are present, 2017-01-03) we require both crypto and ssl
libraries to be present. This makes sense because `OPENSSL_LIBRARIES`
lists both and breaks when one is not found. However, prior to that
fix we supported finding only the crypto library and using it through
the imported target. Drop the requirement for ssl to restore support
for using crypto alone.
Later this module should be taught to support the `COMPONENTS` argument
of `find_package`.
Fixes: #16882
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 609bc17..f7e9637 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -375,7 +375,7 @@ set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY}
${OPENSSL_CRYPTO_LIBRARY} )
if (OPENSSL_VERSION)
find_package_handle_standard_args(OpenSSL
REQUIRED_VARS
- OPENSSL_SSL_LIBRARY
+ #OPENSSL_SSL_LIBRARY # FIXME: require based on a component request?
OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
VERSION_VAR
@@ -385,7 +385,7 @@ if (OPENSSL_VERSION)
)
else ()
find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to
set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
- OPENSSL_SSL_LIBRARY
+ #OPENSSL_SSL_LIBRARY # FIXME: require based on a component request?
OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8f0385f41e75d98b6d3f14f785747c2decb1cd4
commit e8f0385f41e75d98b6d3f14f785747c2decb1cd4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 15 09:53:00 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 15 09:56:41 2017 -0400
FindDevIL: Restore IL_FOUND result variable
The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when
library is not found, 2016-11-24) removed the previously-provided
`IL_FOUND` result variable. Set it for compatibility and update the
documentation to mention the new variable.
Fixes: #16881
diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index 45fab82..7d43482 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -25,7 +25,7 @@
# library interfaces with OpenGL. It is not strictly needed
# in applications.
# IL_INCLUDE_DIR - where to find the il.h, ilu.h and ilut.h files.
-# IL_FOUND - this is set to TRUE if all the above variables were set.
+# DevIL_FOUND - this is set to TRUE if all the above variables were set.
# This will be set to false if ILU or ILUT are not found,
# even if they are not needed. In most systems, if one
# library is found all the others are as well. That's the
@@ -70,3 +70,5 @@ find_library(ILU_LIBRARIES
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG
IL_LIBRARIES ILU_LIBRARIES
IL_INCLUDE_DIR)
+# provide legacy variable for compatiblity
+set(IL_FOUND ${DevIL_FOUND})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c515e192211a787bd35b99eb839cccd7cc60635
commit 3c515e192211a787bd35b99eb839cccd7cc60635
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon May 15 09:23:29 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Mon May 15 09:23:29 2017 -0400
FPHSA: remove extra space
Each missing variable is added to the string as " ${var}" which causes
the string to always have a leading space. Remove the duplicate space
due to this in the output.
diff --git a/Modules/FindPackageHandleStandardArgs.cmake
b/Modules/FindPackageHandleStandardArgs.cmake
index b77925d..b851a90 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -147,7 +147,7 @@ endmacro()
macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
# <name>_CONFIG is set, but FOUND is false, this means that some other of
the REQUIRED_VARS was not found:
if(${_NAME}_CONFIG)
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS}
(found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS}
(found ${${_NAME}_CONFIG} ${VERSION_MSG})")
else()
# If _CONSIDERED_CONFIGS is set, the config-file has been found, but no
suitable version.
# List them all in the error message:
@@ -374,7 +374,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
if(NOT VERSION_OK)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found
${${_FIRST_REQUIRED_VAR}})")
else()
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:
${MISSING_VARS}) ${VERSION_MSG}")
+ _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}
(missing:${MISSING_VARS}) ${VERSION_MSG}")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75accaae8b6a691b031f268f8afc368791a53030
commit 75accaae8b6a691b031f268f8afc368791a53030
Author: Ruslan Baratov <ruslan_bara...@yahoo.com>
AuthorDate: Sun May 14 12:31:26 2017 +0300
Commit: Ruslan Baratov <ruslan_bara...@yahoo.com>
CommitDate: Sun May 14 12:31:26 2017 +0300
GCC: more patterns for ar/ranlib
diff --git a/Modules/Compiler/GNU-FindBinUtils.cmake
b/Modules/Compiler/GNU-FindBinUtils.cmake
index 1aa0219..142636c 100644
--- a/Modules/Compiler/GNU-FindBinUtils.cmake
+++ b/Modules/Compiler/GNU-FindBinUtils.cmake
@@ -2,6 +2,12 @@ if(NOT DEFINED _CMAKE_PROCESSING_LANGUAGE OR
_CMAKE_PROCESSING_LANGUAGE STREQUAL
message(FATAL_ERROR "Internal error: _CMAKE_PROCESSING_LANGUAGE is not set")
endif()
+# Ubuntu 16.04:
+# * /usr/bin/gcc-ar-5
+# * /usr/bin/gcc-ranlib-5
+string(REGEX MATCH "^([0-9]+)" __version_x
+ "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
+
string(REGEX MATCH "^([0-9]+\\.[0-9]+)" __version_x_y
"${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
@@ -10,16 +16,18 @@ get_filename_component(__gcc_hints
"${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPIL
# http://manpages.ubuntu.com/manpages/wily/en/man1/gcc-ar.1.html
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
- "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x_y}"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x}"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar"
HINTS ${__gcc_hints}
DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for
the GCC compiler"
)
# http://manpages.ubuntu.com/manpages/wily/en/man1/gcc-ranlib.1.html
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
- "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x_y}"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x}"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib"
HINTS ${__gcc_hints}
DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option
for the GCC compiler"
)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCSharpInformation.cmake | 22 +++++++++++-----------
Modules/Compiler/GNU-FindBinUtils.cmake | 12 ++++++++++--
Modules/FindDevIL.cmake | 4 +++-
Modules/FindOpenSSL.cmake | 4 ++--
Modules/FindPackageHandleStandardArgs.cmake | 4 ++--
Source/cmFileCommand.cxx | 4 ++++
bootstrap | 1 +
7 files changed, 33 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
