[Cmake-commits] CMake branch, master, updated. v3.10.0-rc1-25-ge110ab9
Kitware Robot
kwrobot at kitware.com
Tue Oct 10 08:55:04 EDT 2017
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 e110ab9e218634b4aefec138a89ea856738f897f (commit)
via 6702ace882318f17c31a4e4a5e3d1af03d48be1d (commit)
via 75ce489c20cba483443324446db8894114dba557 (commit)
via 16589bf46f71a342ff88ac4566b5ed1ee106b33f (commit)
via 6feb0c3318305c4347ac02a0c1d991b98802bd3e (commit)
via 3cebe2aba8dde2a2cafb85097adf48dff84758de (commit)
from c798dc8573a205f90663e9983b793b21fea28521 (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=e110ab9e218634b4aefec138a89ea856738f897f
commit e110ab9e218634b4aefec138a89ea856738f897f
Merge: 6702ace 16589bf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 12:52:31 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 08:52:35 2017 -0400
Merge topic 'FindCUDA-cuda-9-nppi'
16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1360
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6702ace882318f17c31a4e4a5e3d1af03d48be1d
commit 6702ace882318f17c31a4e4a5e3d1af03d48be1d
Merge: 75ce489 6feb0c3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 12:51:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 08:51:03 2017 -0400
Merge topic 'FindJava-tolerant-versions'
6feb0c33 FindJava: Revise version parsing to support Java 9
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1355
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75ce489c20cba483443324446db8894114dba557
commit 75ce489c20cba483443324446db8894114dba557
Merge: c798dc8 3cebe2a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 12:50:28 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 08:50:32 2017 -0400
Merge topic 'revise-3.10-relnotes'
3cebe2ab Help: Revise 3.10 release notes
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1357
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16589bf46f71a342ff88ac4566b5ed1ee106b33f
commit 16589bf46f71a342ff88ac4566b5ed1ee106b33f
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Oct 6 10:38:31 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 6 11:05:35 2017 -0400
FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries
Fixes: #17310
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index bd7d0c0..1c8ac26 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -339,7 +339,27 @@
# CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives lib (core).
# Only available for CUDA version 5.5+.
# CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
-# Only available for CUDA version 5.5+.
+# Only available for CUDA version 5.5 - 8.0.
+# CUDA_nppial_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppicc_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppicom_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppidei_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppif_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppig_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppim_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppist_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppisu_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
+# CUDA_nppitc_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
+# Only available for CUDA version 9.0.
# CUDA_npps_LIBRARY -- NVIDIA Performance Primitives lib (signal processing).
# Only available for CUDA version 5.5+.
# CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
@@ -939,6 +959,24 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
endif()
if(CUDA_VERSION VERSION_GREATER "5.0")
find_cuda_helper_libs(cublas_device)
+endif()
+
+if(NOT CUDA_VERSION VERSION_LESS "9.0")
+ # In CUDA 9.0 NPP was nppi was removed
+ find_cuda_helper_libs(nppc)
+ find_cuda_helper_libs(nppial)
+ find_cuda_helper_libs(nppicc)
+ find_cuda_helper_libs(nppicom)
+ find_cuda_helper_libs(nppidei)
+ find_cuda_helper_libs(nppif)
+ find_cuda_helper_libs(nppig)
+ find_cuda_helper_libs(nppim)
+ find_cuda_helper_libs(nppist)
+ find_cuda_helper_libs(nppisu)
+ find_cuda_helper_libs(nppitc)
+ find_cuda_helper_libs(npps)
+ set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}")
+elseif(CUDA_VERSION VERSION_GREATER "5.0")
# In CUDA 5.5 NPP was splitted onto 3 separate libraries.
find_cuda_helper_libs(nppc)
find_cuda_helper_libs(nppi)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6feb0c3318305c4347ac02a0c1d991b98802bd3e
commit 6feb0c3318305c4347ac02a0c1d991b98802bd3e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 5 13:59:43 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 6 07:29:30 2017 -0400
FindJava: Revise version parsing to support Java 9
Java 9 has only one component. Revise the logic to tolerate any number
of version components 1 through 4. Fix the parsing of individual
components.
Fixes: #17325
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index eb2242b..b913e17 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -39,7 +39,7 @@
# Java_VERSION_MINOR = The minor version of the package found.
# Java_VERSION_PATCH = The patch version of the package found.
# Java_VERSION_TWEAK = The tweak version of the package found (after '_')
-# Java_VERSION = This is set to: $major.$minor.$patch(.$tweak)
+# Java_VERSION = This is set to: $major[.$minor[.$patch[.$tweak]]]
#
#
#
@@ -133,39 +133,56 @@ if(Java_JAVA_EXECUTABLE)
message( STATUS "Warning, could not run java -version")
endif()
else()
- # extract major/minor version and patch level from "java -version" output
- # Tested on linux using
- # 1. Sun / Sun OEM
- # 2. OpenJDK 1.6
- # 3. GCJ 1.5
- # 4. Kaffe 1.4.2
- # 5. OpenJDK 1.7.x on OpenBSD
- if(var MATCHES "java version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\"")
- # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
+ # Extract version components (up to 4 levels) from "java -version" output.
+ set(_java_version_regex [[(([0-9]+)(\.([0-9]+)(\.([0-9]+)(_([0-9]+))?)?)?.*)]])
+ if(var MATCHES "java version \"${_java_version_regex}\"")
+ # Sun, GCJ, older OpenJDK
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
+ set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
+ set(Java_VERSION_MINOR "${CMAKE_MATCH_4}")
+ set(Java_VERSION_PATCH "${CMAKE_MATCH_6}")
+ set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
+ elseif(var MATCHES "openjdk version \"${_java_version_regex}\"")
+ # OpenJDK
+ set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
+ set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
+ set(Java_VERSION_MINOR "${CMAKE_MATCH_4}")
+ set(Java_VERSION_PATCH "${CMAKE_MATCH_6}")
+ set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
elseif(var MATCHES "openjdk version \"([0-9]+)-[A-Za-z]+\"")
# OpenJDK 9 early access builds or locally built
set(Java_VERSION_STRING "1.${CMAKE_MATCH_1}.0")
- elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
+ set(Java_VERSION_MAJOR "1")
+ set(Java_VERSION_MINOR "${CMAKE_MATCH_1}")
+ set(Java_VERSION_PATCH "0")
+ set(Java_VERSION_TWEAK "")
+ elseif(var MATCHES "java full version \"kaffe-${_java_version_regex}\"")
# Kaffe style
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
- elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"")
- # OpenJDK ver 1.7.x on OpenBSD
- set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
+ set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
+ set(Java_VERSION_MINOR "${CMAKE_MATCH_4}")
+ set(Java_VERSION_PATCH "${CMAKE_MATCH_6}")
+ set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
else()
if(NOT Java_FIND_QUIETLY)
- message(WARNING "regex not supported: ${var}. Please report")
+ string(REPLACE "\n" "\n " ver_msg "\n${var}")
+ message(WARNING "Java version not recognized:${ver_msg}\nPlease report.")
endif()
+ set(Java_VERSION_STRING "")
+ set(Java_VERSION_MAJOR "")
+ set(Java_VERSION_MINOR "")
+ set(Java_VERSION_PATCH "")
+ set(Java_VERSION_TWEAK "")
endif()
- string( REGEX REPLACE "([0-9]+).*" "\\1" Java_VERSION_MAJOR "${Java_VERSION_STRING}" )
- string( REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_MINOR "${Java_VERSION_STRING}" )
- string( REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_PATCH "${Java_VERSION_STRING}" )
- # warning tweak version can be empty:
- string( REGEX REPLACE "[0-9]+\\.[0-9]+\\.[0-9]+[_\\.]?([0-9]*).*$" "\\1" Java_VERSION_TWEAK "${Java_VERSION_STRING}" )
- if( Java_VERSION_TWEAK STREQUAL "" ) # check case where tweak is not defined
- set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH})
- else()
- set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH}.${Java_VERSION_TWEAK})
+ set(Java_VERSION "${Java_VERSION_MAJOR}")
+ if(NOT "x${Java_VERSION}" STREQUAL "x")
+ foreach(c MINOR PATCH TWEAK)
+ if(NOT "x${Java_VERSION_${c}}" STREQUAL "x")
+ string(APPEND Java_VERSION ".${Java_VERSION_${c}}")
+ else()
+ break()
+ endif()
+ endforeach()
endif()
endif()
@@ -254,7 +271,7 @@ else()
find_package_handle_standard_args(Java
REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE
Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE
- VERSION_VAR Java_VERSION
+ VERSION_VAR Java_VERSION_STRING
)
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cebe2aba8dde2a2cafb85097adf48dff84758de
commit 3cebe2aba8dde2a2cafb85097adf48dff84758de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 6 06:59:30 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 6 06:59:30 2017 -0400
Help: Revise 3.10 release notes
Reduce duplication of `AUTOMOC` feature text. Clarify QtIFW version
requirements.
diff --git a/Help/release/3.10.rst b/Help/release/3.10.rst
index 2e32401..35fe602 100644
--- a/Help/release/3.10.rst
+++ b/Help/release/3.10.rst
@@ -161,25 +161,16 @@ Autogen
* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``,
``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs
- to be ``moc`` processed. The new variable
- :variable:`CMAKE_AUTOMOC_MACRO_NAMES` allows to register additional
- strings (macro names) so search for.
-
-* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``,
- ``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs
- to be ``moc`` processed. The new target property
- :prop_tgt:`AUTOMOC_MACRO_NAMES` allows to register additional strings
- (macro names) so search for.
-
-* When using :prop_tgt:`AUTOMOC`, the new variable
- :variable:`CMAKE_AUTOMOC_COMPILER_PREDEFINES` allows to default
- enable or disable the generation of the compiler pre definitions file
+ to be ``moc`` processed. The new :variable:`CMAKE_AUTOMOC_MACRO_NAMES`
+ variable and :prop_tgt:`AUTOMOC_MACRO_NAMES` target property may be set
+ to register additional strings (macro names) to search for.
+
+* When using :prop_tgt:`AUTOMOC`, the new
+ :variable:`CMAKE_AUTOMOC_COMPILER_PREDEFINES` variable and
+ :prop_tgt:`AUTOMOC_COMPILER_PREDEFINES` target property specify whether
+ to enable or disable the generation of the compiler pre definitions file
``moc_predefs.h``.
-* When using :prop_tgt:`AUTOMOC`, the new boolean target property
- :prop_tgt:`AUTOMOC_COMPILER_PREDEFINES` allows to enable or disable the
- generation of the compiler pre definitions file ``moc_predefs.h``.
-
CTest
-----
@@ -218,8 +209,8 @@ CPack
* The :module:`CPackIFW` module gained new
:variable:`CPACK_IFW_REPOSITORIES_DIRECTORIES` variable to specify
additional repositories dirs that will be used to resolve and
- repack dependent components. This feature available only
- since QtIFW 3.1.
+ repack dependent components. This feature is only available when
+ using QtIFW 3.1 or later.
* Modules :module:`CPackRPM` and :module:`CPackDeb` learned to set package epoch
version.
-----------------------------------------------------------------------
Summary of changes:
Help/release/3.10.rst | 29 ++++++++-------------
Modules/FindCUDA.cmake | 40 ++++++++++++++++++++++++++++-
Modules/FindJava.cmake | 67 ++++++++++++++++++++++++++++++------------------
3 files changed, 91 insertions(+), 45 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list