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 8308803167368b873641e5066017536a082f3c68 (commit)
via c2f119310f85948ebce3ed76b79be4fdffa1fdd0 (commit)
via 7d83b8010ec6a5479b5860a3aaec5647a143085a (commit)
via 95f546ec2b588174e2e1dfe30d803f2a3c66c2ec (commit)
via a7a0bf861ad434063228146790e6403f5743d2b9 (commit)
via 3566af83f932e6b20feb3e145d3318c556ced270 (commit)
via 1844360099b41932df21c1d2abdc7c0ace389c16 (commit)
via 8b53dee296baf9dbe53cf93e07f0b88e269b2f98 (commit)
from 829ce06c352e84f9b0b5fdd6acd10429181a91ef (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=8308803167368b873641e5066017536a082f3c68
commit 8308803167368b873641e5066017536a082f3c68
Merge: c2f1193 3566af8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 20 13:00:23 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 20 09:00:32 2017 -0400
Merge topic 'FindICU-data-vars'
3566af83 FindICU: Search for packaged data files
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !981
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2f119310f85948ebce3ed76b79be4fdffa1fdd0
commit c2f119310f85948ebce3ed76b79be4fdffa1fdd0
Merge: 7d83b80 a7a0bf8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 20 12:59:37 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 20 08:59:40 2017 -0400
Merge topic 'FindwxWidgets-fix-flag-parse'
a7a0bf86 FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !975
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d83b8010ec6a5479b5860a3aaec5647a143085a
commit 7d83b8010ec6a5479b5860a3aaec5647a143085a
Merge: 95f546e 8b53dee
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 20 12:58:36 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 20 08:58:39 2017 -0400
Merge topic 'curses-form-advanced'
8b53dee2 FindCurses: mark CURSES_FORM_LIBRARY as advanced
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !978
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95f546ec2b588174e2e1dfe30d803f2a3c66c2ec
commit 95f546ec2b588174e2e1dfe30d803f2a3c66c2ec
Merge: 829ce06 1844360
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 20 12:57:07 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 20 08:57:12 2017 -0400
Merge topic 'vs_dotnet_referenceprop_documentation'
18443600 Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !980
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7a0bf861ad434063228146790e6403f5743d2b9
commit a7a0bf861ad434063228146790e6403f5743d2b9
Author: Thierry Crozat <cri...@scummvm.org>
AuthorDate: Fri Jun 16 19:50:27 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 19 13:56:09 2017 -0400
FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I
Use proper command-line parsing rather than accidentally matching
content in the middle of paths that looks like flags.
Fixes: #16986
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index af4daf0..63f2c60 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -778,28 +778,24 @@ else()
)
if(RET EQUAL 0)
string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
- separate_arguments(wxWidgets_CXX_FLAGS)
+ separate_arguments(wxWidgets_CXX_FLAGS_LIST NATIVE_COMMAND
"${wxWidgets_CXX_FLAGS}")
DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
- # parse definitions from cxxflags;
- # drop -D* from CXXFLAGS and the -D prefix
- string(REGEX MATCHALL "-D[^;]+"
- wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}")
- string(REGEX REPLACE "-D[^;]+(;|$)" ""
- wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- string(REGEX REPLACE ";$" ""
- wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- string(REPLACE "-D" ""
- wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
-
- # parse include dirs from cxxflags; drop -I prefix
- string(REGEX MATCHALL "-I[^;]+"
- wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
- string(REGEX REPLACE "-I[^;]+;" ""
- wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- string(REPLACE "-I" ""
- wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
+ # parse definitions and include dirs from cxxflags
+ # drop the -D and -I prefixes
+ set(wxWidgets_CXX_FLAGS)
+ foreach(arg IN LISTS wxWidgets_CXX_FLAGS_LIST)
+ if("${arg}" MATCHES "^-I(.*)$")
+ # include directory
+ list(APPEND wxWidgets_INCLUDE_DIRS "${CMAKE_MATCH_1}")
+ elseif("${arg}" MATCHES "^-D(.*)$")
+ # compile definition
+ list(APPEND wxWidgets_DEFINITIONS "${CMAKE_MATCH_1}")
+ else()
+ list(APPEND wxWidgets_CXX_FLAGS "${arg}")
+ endif()
+ endforeach()
DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3566af83f932e6b20feb3e145d3318c556ced270
commit 3566af83f932e6b20feb3e145d3318c556ced270
Author: Roger Leigh <rle...@codelibre.net>
AuthorDate: Sat Jun 17 23:05:53 2017 +0100
Commit: Roger Leigh <rle...@codelibre.net>
CommitDate: Sat Jun 17 23:07:44 2017 +0100
FindICU: Search for packaged data files
The files Makefile.inc and pkgdata.inc are installed by ICU to
<libdir>/icu and on some distributions to <libdir>/<arch>/icu.
These are required by ICU tools like pkgdata, and so are needed
by other package build systems at build time, in addition to the
libraries and executables already searched for.
Search for the files and create cache entries for them, as done
for executables.
diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 5210f08..d9705d9 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -55,6 +55,11 @@
# ICU_<C>_FOUND - ON if component was found
# ICU_<C>_LIBRARIES - libraries for component
#
+# ICU datafiles are reported in::
+#
+# ICU_MAKEFILE_INC - Makefile.inc
+# ICU_PKGDATA_INC - pkgdata.inc
+#
# Note that ``<C>`` is the uppercased name of the component.
#
# This module reads hints about search results from::
@@ -100,6 +105,10 @@ set(icu_programs
icupkg
gencmn)
+set(icu_data
+ Makefile.inc
+ pkgdata.inc)
+
# The ICU checks are contained in a function due to the large number
# of temporary variables needed.
function(_ICU_FIND)
@@ -116,6 +125,28 @@ function(_ICU_FIND)
endif()
endif()
+ # Find include directory
+ list(APPEND icu_include_suffixes "include")
+ find_path(ICU_INCLUDE_DIR
+ NAMES "unicode/utypes.h"
+ HINTS ${icu_roots}
+ PATH_SUFFIXES ${icu_include_suffixes}
+ DOC "ICU include directory")
+ set(ICU_INCLUDE_DIR "${ICU_INCLUDE_DIR}" PARENT_SCOPE)
+
+ # Get version
+ if(ICU_INCLUDE_DIR AND EXISTS "${ICU_INCLUDE_DIR}/unicode/uvernum.h")
+ file(STRINGS "${ICU_INCLUDE_DIR}/unicode/uvernum.h" icu_header_str
+ REGEX "^#define[\t ]+U_ICU_VERSION[\t ]+\".*\".*")
+
+ string(REGEX REPLACE "^#define[\t ]+U_ICU_VERSION[\t ]+\"([^ \\n]*)\".*"
+ "\\1" icu_version_string "${icu_header_str}")
+ set(ICU_VERSION "${icu_version_string}")
+ set(ICU_VERSION "${icu_version_string}" PARENT_SCOPE)
+ unset(icu_header_str)
+ unset(icu_version_string)
+ endif()
+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
# 64-bit binary directory
set(_bin64 "bin64")
@@ -123,12 +154,9 @@ function(_ICU_FIND)
set(_lib64 "lib64")
endif()
- # Generic 64-bit and 32-bit directories
- list(APPEND icu_binary_suffixes "${_bin64}" "bin")
- list(APPEND icu_library_suffixes "${_lib64}" "lib")
- list(APPEND icu_include_suffixes "include")
# Find all ICU programs
+ list(APPEND icu_binary_suffixes "${_bin64}" "bin")
foreach(program ${icu_programs})
string(TOUPPER "${program}" program_upcase)
set(cache_var "ICU_${program_upcase}_EXECUTABLE")
@@ -141,27 +169,8 @@ function(_ICU_FIND)
set("${program_var}" "${${cache_var}}" PARENT_SCOPE)
endforeach()
- # Find include directory
- find_path(ICU_INCLUDE_DIR
- NAMES "unicode/utypes.h"
- HINTS ${icu_roots}
- PATH_SUFFIXES ${icu_include_suffixes}
- DOC "ICU include directory")
- set(ICU_INCLUDE_DIR "${ICU_INCLUDE_DIR}" PARENT_SCOPE)
-
- # Get version
- if(ICU_INCLUDE_DIR AND EXISTS "${ICU_INCLUDE_DIR}/unicode/uvernum.h")
- file(STRINGS "${ICU_INCLUDE_DIR}/unicode/uvernum.h" icu_header_str
- REGEX "^#define[\t ]+U_ICU_VERSION[\t ]+\".*\".*")
-
- string(REGEX REPLACE "^#define[\t ]+U_ICU_VERSION[\t ]+\"([^ \\n]*)\".*"
- "\\1" icu_version_string "${icu_header_str}")
- set(ICU_VERSION "${icu_version_string}" PARENT_SCOPE)
- unset(icu_header_str)
- unset(icu_version_string)
- endif()
-
# Find all ICU libraries
+ list(APPEND icu_library_suffixes "${_lib64}" "lib")
set(ICU_REQUIRED_LIBS_FOUND ON)
foreach(component ${ICU_FIND_COMPONENTS})
string(TOUPPER "${component}" component_upcase)
@@ -233,6 +242,32 @@ function(_ICU_FIND)
set(_ICU_REQUIRED_LIBS_FOUND "${ICU_REQUIRED_LIBS_FOUND}" PARENT_SCOPE)
set(ICU_LIBRARY "${ICU_LIBRARY}" PARENT_SCOPE)
+ # Find all ICU data files
+ if(CMAKE_LIBRARY_ARCHITECTURE)
+ list(APPEND icu_data_suffixes
+ "${_lib64}/${CMAKE_LIBRARY_ARCHITECTURE}/icu/${ICU_VERSION}"
+ "lib/${CMAKE_LIBRARY_ARCHITECTURE}/icu/${ICU_VERSION}"
+ "${_lib64}/${CMAKE_LIBRARY_ARCHITECTURE}/icu"
+ "lib/${CMAKE_LIBRARY_ARCHITECTURE}/icu")
+ endif()
+ list(APPEND icu_data_suffixes
+ "${_lib64}/icu/${ICU_VERSION}"
+ "lib/icu/${ICU_VERSION}"
+ "${_lib64}/icu"
+ "lib/icu")
+ foreach(data ${icu_data})
+ string(TOUPPER "${data}" data_upcase)
+ string(REPLACE "." "_" data_upcase "${data_upcase}")
+ set(cache_var "ICU_${data_upcase}")
+ set(data_var "ICU_${data_upcase}")
+ find_file("${cache_var}" "${data}"
+ HINTS ${icu_roots}
+ PATH_SUFFIXES ${icu_data_suffixes}
+ DOC "ICU ${data} data file")
+ mark_as_advanced(cache_var)
+ set("${data_var}" "${${cache_var}}" PARENT_SCOPE)
+ endforeach()
+
if(NOT ICU_FIND_QUIETLY)
if(ICU_LIBS_FOUND)
message(STATUS "Found the following ICU libraries:")
@@ -334,6 +369,15 @@ if(ICU_DEBUG)
unset(program_lib)
endforeach()
+ foreach(data IN LISTS icu_data)
+ string(TOUPPER "${data}" data_upcase)
+ string(REPLACE "." "_" data_upcase "${data_upcase}")
+ set(data_lib "ICU_${data_upcase}")
+ message(STATUS "${data} data: ${${data_lib}}")
+ unset(data_upcase)
+ unset(data_lib)
+ endforeach()
+
foreach(component IN LISTS ICU_FIND_COMPONENTS)
string(TOUPPER "${component}" component_upcase)
set(component_lib "ICU_${component_upcase}_LIBRARIES")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1844360099b41932df21c1d2abdc7c0ace389c16
commit 1844360099b41932df21c1d2abdc7c0ace389c16
Author: Michael Stürmer <michael.stuer...@schaeffler.com>
AuthorDate: Sat Jun 17 17:20:05 2017 +0200
Commit: Michael Stürmer <michael.stuer...@schaeffler.com>
CommitDate: Sat Jun 17 22:56:28 2017 +0200
Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*
diff --git a/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
b/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
index 478a04c..ab311ea 100644
--- a/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
+++ b/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
@@ -1,11 +1,14 @@
VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>
-----------------------------------------------
-Visual Studio managed project .NET reference with name ``<refname>``
-and hint path.
+Defines an XML property ``<tagname>`` for a .NET reference
+``<refname>``.
-Adds one .NET reference to generated Visual Studio project. The
-reference will have the name ``<refname>`` and will point to the
-assembly given as value of the property.
+Reference properties can be set for .NET references which are
+defined by the target properties :prop_tgt:`VS_DOTNET_REFERENCES`,
+:prop_tgt:`VS_DOTNET_REFERENCE_<refname>`
+and also for project references to other C# targets which are
+established by :command:`target_link_libraries()`.
-See also the :prop_tgt:`VS_DOTNET_REFERENCE_<refname>` target property.
+This property is only applicable to C# targets and Visual Studio
+generators 2010 and later.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b53dee296baf9dbe53cf93e07f0b88e269b2f98
commit 8b53dee296baf9dbe53cf93e07f0b88e269b2f98
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Jun 17 15:13:50 2017 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sat Jun 17 15:13:50 2017 +0200
FindCurses: mark CURSES_FORM_LIBRARY as advanced
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 4365e99..8d58d03 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -199,4 +199,5 @@ mark_as_advanced(
CURSES_CURSES_LIBRARY
CURSES_NCURSES_LIBRARY
CURSES_EXTRA_LIBRARY
+ CURSES_FORM_LIBRARY
)
-----------------------------------------------------------------------
Summary of changes:
...VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst | 15 ++--
Modules/FindCurses.cmake | 1 +
Modules/FindICU.cmake | 92 +++++++++++++++-----
Modules/FindwxWidgets.cmake | 34 ++++----
4 files changed, 93 insertions(+), 49 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
