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 4fc10431f06a07cd7ac1fafa7f3a8e633bea204c (commit)
via fe8f6e362a42ae621dc0f6fd73e86eee307ce23b (commit)
via 2161f810d986b76e774c522408a0e1e648a1f92e (commit)
via 417eb5739a35a57bc345bf32c56c80d13e33b292 (commit)
via 0a65768068e85d69a10012f9d628ddc7d31a81d0 (commit)
via f4ed56ab632000d51132bafe191137dd6012b9d6 (commit)
from 70290a2abf9e192bb1e0267ec9a6abedde9ba7db (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=4fc10431f06a07cd7ac1fafa7f3a8e633bea204c
commit 4fc10431f06a07cd7ac1fafa7f3a8e633bea204c
Merge: fe8f6e3 f4ed56a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 10 13:26:30 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 10 09:26:39 2019 -0400
Merge topic 'elseif'
f4ed56ab63 Fix elseif() in place of else()
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Alex Turbov <i.za...@gmail.com>
Acked-by: Rolf Eike Beer <e...@sf-mail.de>
Merge-request: !3515
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe8f6e362a42ae621dc0f6fd73e86eee307ce23b
commit fe8f6e362a42ae621dc0f6fd73e86eee307ce23b
Merge: 2161f81 417eb57
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 10 13:25:39 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 10 09:25:48 2019 -0400
Merge topic 'clang-test-fixes'
417eb5739a Tests: fix some Clang failures on Windows
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3518
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2161f810d986b76e774c522408a0e1e648a1f92e
commit 2161f810d986b76e774c522408a0e1e648a1f92e
Merge: 70290a2 0a65768
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 10 13:24:14 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 10 09:24:23 2019 -0400
Merge topic 'eclipse-init-members'
0a65768068 Eclpise: Fix compiler warnings about uninitialized member
variables
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3524
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=417eb5739a35a57bc345bf32c56c80d13e33b292
commit 417eb5739a35a57bc345bf32c56c80d13e33b292
Author: Zsolt Parragi <zsolt.parr...@cancellar.hu>
AuthorDate: Sat Jul 6 14:56:54 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 9 11:30:25 2019 -0400
Tests: fix some Clang failures on Windows
* Execute MSVCRuntimeLibrary tests for GNU command line mode Clang on
Windows using the MSVC ABI
* Assembler tests should be executed with the Ninja generator
* Assembler tests shouldn't be executed with clang-cl
* Fixed a condition in the Preprocess test for clang-cl
* Adjusted the conditions on some MSVC specific tests
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index fb17ebb..21b265c 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -7,9 +7,10 @@ set(SRCS)
# (at least) the following toolchains can process assembler files directly
# and also generate assembler files from C:
-if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode" AND
+if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode|Ninja" AND
NOT CMAKE_OSX_ARCHITECTURES)
- if((CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|HP|SunPro|XL)$") OR
(CMAKE_C_COMPILER_ID STREQUAL "Intel" AND UNIX))
+ if((CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|HP|SunPro|XL)$") OR
(CMAKE_C_COMPILER_ID STREQUAL "Intel" AND UNIX)
+ AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
"x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC"))
set(C_FLAGS "${CMAKE_C_FLAGS}")
separate_arguments(C_FLAGS)
if(CMAKE_OSX_SYSROOT AND CMAKE_C_SYSROOT_FLAG AND NOT ";${C_FLAGS};"
MATCHES ";${CMAKE_C_SYSROOT_FLAG};")
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b8b7e21..d951316 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1877,9 +1877,11 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir
dev -- '${CMake_BUILD_NIGH
endif ()
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SubDir")
- if(MSVC)
- ADD_TEST_MACRO(ForceInclude foo)
+ if(MSVC OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_SIMULATE_ID
STREQUAL "MSVC"))
ADD_TEST_MACRO(PDBDirectoryAndName myexe)
+ if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR NOT
"x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+ ADD_TEST_MACRO(ForceInclude foo)
+ endif()
if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
ADD_TEST_MACRO(PrecompiledHeader foo)
endif()
diff --git a/Tests/PDBDirectoryAndName/CMakeLists.txt
b/Tests/PDBDirectoryAndName/CMakeLists.txt
index 6d8d6cc..44194ca 100644
--- a/Tests/PDBDirectoryAndName/CMakeLists.txt
+++ b/Tests/PDBDirectoryAndName/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_policy(SET CMP0054 NEW)
project(PDBDirectoryAndName C)
# Make sure the proper compiler is in use.
-if(NOT MSVC AND NOT CMAKE_C_COMPILER_ID STREQUAL "Intel")
- message(FATAL_ERROR "The PDBDirectoryAndName test works only with MSVC or
Intel")
+if(NOT MSVC AND NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT
CMAKE_C_COMPILER_ID STREQUAL "Clang")
+ message(FATAL_ERROR "The PDBDirectoryAndName test works only with MSVC,
Clang or Intel")
endif()
# Intel 11.1 does not support /Fd but Intel 14.0 does.
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 588af03..bce1b3f 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -29,7 +29,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
set(PP_VS 1)
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
- "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" AND
+ "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
+ set(CLANG_MSVC_WINDOWS 1)
+endif()
+if(CLANG_MSVC_WINDOWS AND
"x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
set(CLANG_GNULIKE_WINDOWS 1)
endif()
@@ -106,7 +109,7 @@ endif()
set(EXPR_OP1 "/")
if((NOT MSVC OR PP_NMAKE) AND
NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND
- NOT CLANG_GNULIKE_WINDOWS)
+ NOT CLANG_MSVC_WINDOWS)
# MSVC cl, Intel icl: %
# When the cl compiler is invoked from the command line then % must
# be written %% (to distinguish from %ENV% syntax). However cl does
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a65768068e85d69a10012f9d628ddc7d31a81d0
commit 0a65768068e85d69a10012f9d628ddc7d31a81d0
Author: Martin Gerhardy <martin.gerha...@gmail.com>
AuthorDate: Mon Jul 8 09:19:33 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 9 11:08:50 2019 -0400
Eclpise: Fix compiler warnings about uninitialized member variables
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index aece3bc..d6f7021 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -44,6 +44,8 @@ void AppendDictionary(cmXMLWriter& xml, const char* key, T
const& value)
cmExtraEclipseCDT4Generator::cmExtraEclipseCDT4Generator()
{
+ this->IsOutOfSourceBuild = false;
+ this->GenerateSourceProject = false;
this->SupportsVirtualFolders = true;
this->GenerateLinkedResources = true;
this->SupportsGmakeErrorParser = true;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4ed56ab632000d51132bafe191137dd6012b9d6
commit f4ed56ab632000d51132bafe191137dd6012b9d6
Author: Artalus <artalus-m...@yandex.ru>
AuthorDate: Wed Jul 3 11:57:08 2019 +0300
Commit: Artalus <artalus-m...@yandex.ru>
CommitDate: Wed Jul 3 11:57:53 2019 +0300
Fix elseif() in place of else()
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake
index 4b02a9a..2b37e25 100644
--- a/Modules/Compiler/IAR-C.cmake
+++ b/Modules/Compiler/IAR-C.cmake
@@ -15,7 +15,7 @@ if(CMAKE_C_COMPILER_VERSION_INTERNAL VERSION_GREATER 7)
set(CMAKE_C90_EXTENSION_COMPILE_OPTION --c89 -e)
set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
set(CMAKE_C99_EXTENSION_COMPILE_OPTION -e)
-elseif()
+else()
set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
set(CMAKE_C90_EXTENSION_COMPILE_OPTION -e)
endif()
diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
index cf1632a..3d8ce88 100644
--- a/Modules/FindBacktrace.cmake
+++ b/Modules/FindBacktrace.cmake
@@ -74,7 +74,7 @@ else()
if(Backtrace_INCLUDE_DIR)
# OpenBSD has libbacktrace renamed to libexecinfo
find_library(Backtrace_LIBRARY "execinfo")
- elseif() # respect user wishes
+ else() # respect user wishes
set(_Backtrace_HEADER_TRY "backtrace.h")
find_path(Backtrace_INCLUDE_DIR ${_Backtrace_HEADER_TRY})
find_library(Backtrace_LIBRARY "backtrace")
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a145b46..3993968 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -670,7 +670,7 @@ if (QT_QMAKE_EXECUTABLE AND
get_filename_component(qt_headers "${QT_QTCORE_INCLUDE_DIR}/../"
ABSOLUTE)
set(QT_HEADERS_DIR "${qt_headers}" CACHE INTERNAL "" FORCE)
endif()
- elseif()
+ else()
message("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_HEADERS as
${qt_headers}")
message("Warning: But QtCore couldn't be found. Qt must NOT be
installed correctly.")
endif()
diff --git a/Tests/RunCMake/VS10Project/VsPackageReferences-check.cmake
b/Tests/RunCMake/VS10Project/VsPackageReferences-check.cmake
index 4ff5327..512a1c9 100644
--- a/Tests/RunCMake/VS10Project/VsPackageReferences-check.cmake
+++ b/Tests/RunCMake/VS10Project/VsPackageReferences-check.cmake
@@ -25,7 +25,7 @@ foreach(i 1 2)
if(line MATCHES "^ *<PackageReference .* Version=\"${testVersion}\".*>$")
set(Library${i}Found TRUE)
message(STATUS "foo.vcxproj is using package reference ${testLibrary}
with version ${testVersion}")
- elseif()
+ else()
message(STATUS "foo.vcxproj failed to define reference ${testLibrary}
with version ${testVersion}")
set(Library${i}Found FALSE)
endif()
diff --git a/Utilities/cmcurl/CMake/CurlSymbolHiding.cmake
b/Utilities/cmcurl/CMake/CurlSymbolHiding.cmake
index 15ba46e..60ee8e6 100644
--- a/Utilities/cmcurl/CMake/CurlSymbolHiding.cmake
+++ b/Utilities/cmcurl/CMake/CurlSymbolHiding.cmake
@@ -53,7 +53,7 @@ elseif(MSVC)
message(WARNING "Hiding private symbols regardless CURL_HIDDEN_SYMBOLS
being disabled.")
set(HIDES_CURL_PRIVATE_SYMBOLS TRUE)
endif()
-elseif()
+else()
set(HIDES_CURL_PRIVATE_SYMBOLS FALSE)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/IAR-C.cmake | 2 +-
Modules/FindBacktrace.cmake | 2 +-
Modules/FindQt4.cmake | 2 +-
Source/cmExtraEclipseCDT4Generator.cxx | 2 ++
Tests/Assembler/CMakeLists.txt | 5 +++--
Tests/CMakeLists.txt | 6 ++++--
Tests/PDBDirectoryAndName/CMakeLists.txt | 4 ++--
Tests/Preprocess/CMakeLists.txt | 7 +++++--
Tests/RunCMake/VS10Project/VsPackageReferences-check.cmake | 2 +-
Utilities/cmcurl/CMake/CurlSymbolHiding.cmake | 2 +-
10 files changed, 21 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
