[Cmake-commits] CMake branch, master, updated. v3.11.1-721-gf1344ca
Kitware Robot
kwrobot at kitware.com
Tue May 8 08:25:04 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 f1344ca2adbca2ec2385886eeed65bf01966be8f (commit)
via 14bfd267e5e7498f0131b87e54c11cafa2ff6903 (commit)
via e15adbfed322a7db218a82108cba26bcba57b30c (commit)
via b4e156931511777ffb1b512a6b21e88b02d6bd43 (commit)
from c0fa21322c0996df8479fd58f33345c051226fd2 (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=f1344ca2adbca2ec2385886eeed65bf01966be8f
commit f1344ca2adbca2ec2385886eeed65bf01966be8f
Merge: 14bfd26 e15adbf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 8 12:20:34 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 8 08:21:27 2018 -0400
Merge topic 'doc-updates'
e15adbfed3 Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usage
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2043
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14bfd267e5e7498f0131b87e54c11cafa2ff6903
commit 14bfd267e5e7498f0131b87e54c11cafa2ff6903
Merge: c0fa213 b4e1569
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 8 12:20:25 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 8 08:20:36 2018 -0400
Merge topic 'java-new-packaging-fixes'
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2042
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e15adbfed322a7db218a82108cba26bcba57b30c
commit e15adbfed322a7db218a82108cba26bcba57b30c
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Sat May 5 17:15:01 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 7 09:45:23 2018 -0400
Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usage
diff --git a/Help/prop_sf/COMPILE_FLAGS.rst b/Help/prop_sf/COMPILE_FLAGS.rst
index be81cf6..c211b89 100644
--- a/Help/prop_sf/COMPILE_FLAGS.rst
+++ b/Help/prop_sf/COMPILE_FLAGS.rst
@@ -3,9 +3,9 @@ COMPILE_FLAGS
Additional flags to be added when compiling this source file.
-The ``COMPILE_FLAGS`` property sets additional compiler flags used to build
-source files. Use :prop_sf:`COMPILE_DEFINITIONS` to pass additional
-preprocessor definitions.
+The ``COMPILE_FLAGS`` property, managed as a string, sets additional compiler
+flags used to build source files. Use :prop_sf:`COMPILE_DEFINITIONS` to pass
+additional preprocessor definitions.
Contents of ``COMPILE_FLAGS`` may use "generator expressions"
with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
@@ -13,3 +13,7 @@ manual for available expressions. However, :generator:`Xcode`
does not support per-config per-source settings, so expressions
that depend on the build configuration are not allowed with that
generator.
+
+.. note::
+
+ This property has been superseded by the :prop_sf:`COMPILE_OPTIONS` property.
diff --git a/Help/prop_sf/COMPILE_OPTIONS.rst b/Help/prop_sf/COMPILE_OPTIONS.rst
index 157c0b0..3b2bc8d 100644
--- a/Help/prop_sf/COMPILE_OPTIONS.rst
+++ b/Help/prop_sf/COMPILE_OPTIONS.rst
@@ -15,3 +15,7 @@ for available expressions. However, :generator:`Xcode`
does not support per-config per-source settings, so expressions
that depend on the build configuration are not allowed with that
generator.
+
+.. note::
+
+ This property should be preferred over the :prop_sf:`COMPILE_FLAGS` property.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4e156931511777ffb1b512a6b21e88b02d6bd43
commit b4e156931511777ffb1b512a6b21e88b02d6bd43
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Sat May 5 15:45:57 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 7 09:40:55 2018 -0400
FindJava, FindJNI: fix erroneous regex, enhance registry lookup
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index ff8d353..4913e05 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -128,7 +128,7 @@ if (WIN32)
OUTPUT_VARIABLE _JNI_VERSIONS
ERROR_QUIET)
if (NOT _JNI_RESULT)
- string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9\.]+" _JNI_VERSIONS "${_JNI_VERSIONS}")
+ string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9.]+" _JNI_VERSIONS "${_JNI_VERSIONS}")
if (_JNI_VERSIONS)
# sort versions. Most recent first
## handle version 9 apart from other versions to get correct ordering
@@ -141,7 +141,7 @@ if (WIN32)
list (REVERSE _JNI_V9)
list (APPEND _JNI_VERSIONS ${_JNI_V9})
foreach (_JNI_HINT IN LISTS _JNI_VERSIONS)
- list(APPEND _JNI_HINTS "[${_JNI_HINT}\\MSI;INSTALLDIR]")
+ list(APPEND _JNI_HINTS "[${_JNI_HINT};JavaHome]")
endforeach()
endif()
endif()
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 45bc254..306f35d 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -97,7 +97,7 @@ if (WIN32)
list (REVERSE _JAVA_V9)
list (APPEND _JAVA_VERSIONS ${_JAVA_V9})
foreach (_JAVA_HINT IN LISTS _JAVA_VERSIONS)
- list(APPEND _JAVA_HINTS "[${_JAVA_HINT}\\MSI;INSTALLDIR]/bin")
+ list(APPEND _JAVA_HINTS "[${_JAVA_HINT};JavaHome]/bin")
endforeach()
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/prop_sf/COMPILE_FLAGS.rst | 10 +++++++---
Help/prop_sf/COMPILE_OPTIONS.rst | 4 ++++
Modules/FindJNI.cmake | 4 ++--
Modules/FindJava.cmake | 2 +-
4 files changed, 14 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list