[Cmake-commits] CMake branch, master, updated. v3.11.0-383-g561238b
Kitware Robot
kwrobot at kitware.com
Tue Apr 3 09:45:03 EDT 2018
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 561238bb6f07a5ab31293928bd98f6f8911d8bc1 (commit)
via a01caf81a69ba53d04abee97c7aa277d4762ac27 (commit)
via cad7385ab6e76b344406214aa103bee505939156 (commit)
via 12e6796b6289dbc910b9b7fe57f6b564edbc46dd (commit)
via 5c948aa50d31640b7409228a63bf4a393d4caeeb (commit)
via d6883801cd51953a846f8d2323076b3bf58852b1 (commit)
from 5ab647cdde2aeecf359fc47f40dc9548efc43900 (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=561238bb6f07a5ab31293928bd98f6f8911d8bc1
commit 561238bb6f07a5ab31293928bd98f6f8911d8bc1
Merge: a01caf8 d688380
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 3 13:38:15 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 3 09:38:41 2018 -0400
Merge topic 'FPHSA-include'
d6883801cd Find*: always include FPHSA shipped with CMake
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1910
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a01caf81a69ba53d04abee97c7aa277d4762ac27
commit a01caf81a69ba53d04abee97c7aa277d4762ac27
Merge: cad7385 5c948aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 3 13:38:03 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 3 09:38:09 2018 -0400
Merge topic 'FindDCMTK-includes'
5c948aa50d FindDCMTK: use CheckIncludeFiles instead of open coding it
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1911
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad7385ab6e76b344406214aa103bee505939156
commit cad7385ab6e76b344406214aa103bee505939156
Merge: 5ab647c 12e6796
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 3 13:36:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 3 09:36:37 2018 -0400
Merge topic 'android-clang-std-flags'
12e6796b62 Android: Do not pass non-existent Clang -std flags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1913
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12e6796b6289dbc910b9b7fe57f6b564edbc46dd
commit 12e6796b6289dbc910b9b7fe57f6b564edbc46dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 2 14:44:39 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 2 15:15:20 2018 -0400
Android: Do not pass non-existent Clang -std flags
Android NDK r16b comes with
Android clang version 5.0.300080 (based on LLVM 5.0.300080)
Although it claims version 5, it does not support the `-std=c++17`
or `-std=c++2a` flags that upstream Clang does.
Android NDK r17-beta1 comes with
Android (4639204 based on r316199) clang version 6.0.1
that does have the flags.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 321ddf6..77866e9 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -32,7 +32,12 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+ set(_clang_version_std17 5.0)
+ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+ set(_clang_version_std17 6.0)
+ endif()
+
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${_clang_version_std17}")
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
@@ -40,10 +45,12 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
endif()
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${_clang_version_std17}")
set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a")
set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++2a")
endif()
+
+ unset(_clang_version_std17)
else()
# clang-cl does not know these options because it behaves like cl.exe
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c948aa50d31640b7409228a63bf4a393d4caeeb
commit 5c948aa50d31640b7409228a63bf4a393d4caeeb
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 2 10:45:18 2018 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Apr 2 17:59:45 2018 +0200
FindDCMTK: use CheckIncludeFiles instead of open coding it
While at it remove a needless status message.
diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index f348d3a..cc07e26 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -309,20 +309,14 @@ find_package_handle_standard_args(DCMTK
# Workaround bug in packaging of DCMTK 3.6.0 on Debian.
# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637687
if(DCMTK_FOUND AND UNIX AND NOT APPLE)
- include(CheckCXXSourceCompiles)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckIncludeFiles.cmake)
set(CMAKE_REQUIRED_FLAGS )
set(CMAKE_REQUIRED_DEFINITIONS )
set(CMAKE_REQUIRED_INCLUDES ${DCMTK_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${DCMTK_LIBRARIES})
set(CMAKE_REQUIRED_QUIET ${DCMTK_FIND_QUIETLY})
- check_cxx_source_compiles("#include <dcmtk/config/osconfig.h>\n#include <dcmtk/ofstd/ofstream.h>\nint main(int,char*[]){return 0;}"
- DCMTK_HAVE_CONFIG_H_OPTIONAL
- )
+ check_include_files("dcmtk/config/osconfig.h;dcmtk/ofstd/ofstream.h" DCMTK_HAVE_CONFIG_H_OPTIONAL LANGUAGE CXX)
if(NOT DCMTK_HAVE_CONFIG_H_OPTIONAL)
set(DCMTK_DEFINITIONS "HAVE_CONFIG_H")
endif()
endif()
-
-if(NOT DCMTK_FIND_QUIETLY)
- message(STATUS "Trying to find DCMTK relying on FindDCMTK.cmake - ok")
-endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6883801cd51953a846f8d2323076b3bf58852b1
commit d6883801cd51953a846f8d2323076b3bf58852b1
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 2 10:48:31 2018 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Apr 2 10:48:31 2018 +0200
Find*: always include FPHSA shipped with CMake
diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index f348d3a..95bc5e0 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -301,7 +301,7 @@ endif()
# Compatibility: This variable is deprecated
set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS})
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(DCMTK
REQUIRED_VARS ${DCMTK_INCLUDE_DIR_NAMES} DCMTK_LIBRARIES
FAIL_MESSAGE "Please set DCMTK_DIR and re-run configure")
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 8402b23..33b755a 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -213,7 +213,7 @@
set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
include(CheckCXXCompilerFlag)
include(CheckCCompilerFlag)
diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake
index 1f4c8ad..4c60ed7 100644
--- a/Modules/FindVulkan.cmake
+++ b/Modules/FindVulkan.cmake
@@ -65,7 +65,7 @@ endif()
set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(Vulkan
DEFAULT_MSG
Vulkan_LIBRARY Vulkan_INCLUDE_DIR)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-CXX.cmake | 11 +++++++++--
Modules/FindDCMTK.cmake | 12 +++---------
Modules/FindMatlab.cmake | 2 +-
Modules/FindVulkan.cmake | 2 +-
4 files changed, 14 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list