[Cmake-commits] CMake branch, next, updated. v3.3.0-2228-g3a4935a

[Brad King]

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, next has been updated
       via  3a4935a1dccd4886c8f7a4c03d416157d1937f81 (commit)
       via  db292564293ce6899728fa172614d4eec59b429f (commit)
       via  021bf871a6ffa51b6bd0f5834e8a5049c54f8b30 (commit)
      from  e3e1e3d47072b631f0a857079a6b6e362f31d9a7 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a4935a1dccd4886c8f7a4c03d416157d1937f81
commit 3a4935a1dccd4886c8f7a4c03d416157d1937f81
Merge: e3e1e3d db29256
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 09:54:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 14 09:54:06 2015 -0400

    Merge topic 'FindXercesC-updates' into next
    
    db292564 FindXercesC: Add support for 3D_1 variant of the library
    021bf871 FindXercesC: Find debug and release libraries separately


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db292564293ce6899728fa172614d4eec59b429f
commit db292564293ce6899728fa172614d4eec59b429f
Author:     Roger Leigh <rleigh at dundee.ac.uk>
AuthorDate: Thu Aug 13 15:37:41 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 14 09:52:48 2015 -0400

    FindXercesC: Add support for 3D_1 variant of the library
    
    This version is generated by the Windows Visual Studio
    project files for unknown reasons, but is required to
    pick up the debug version of the library created by
    current versions of Xerces-C.

diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index 23919c7..cf84826 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -67,7 +67,7 @@ if(NOT XercesC_LIBRARY)
                NAMES "xerces-c" "xerces-c_3"
                DOC "Xerces-C++ libraries (release)")
   find_library(XercesC_LIBRARY_DEBUG
-               NAMES "xerces-cd" "xerces-c_3D"
+               NAMES "xerces-cd" "xerces-c_3D" "xerces-c_3_1D"
                DOC "Xerces-C++ libraries (debug)")
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(XercesC)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=021bf871a6ffa51b6bd0f5834e8a5049c54f8b30
commit 021bf871a6ffa51b6bd0f5834e8a5049c54f8b30
Author:     Roger Leigh <rleigh at dundee.ac.uk>
AuthorDate: Fri Aug 7 13:54:34 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 14 09:52:36 2015 -0400

    FindXercesC: Find debug and release libraries separately

diff --git a/Help/release/dev/FindXercesC-updates.rst b/Help/release/dev/FindXercesC-updates.rst
new file mode 100644
index 0000000..47a8ada
--- /dev/null
+++ b/Help/release/dev/FindXercesC-updates.rst
@@ -0,0 +1,5 @@
+FindXercesC-updates
+-------------------
+
+* The :module:`FindXercesC` module learned to search separately for
+  debug and release variants.
diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index fd0b992..23919c7 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -61,10 +61,18 @@ find_path(XercesC_INCLUDE_DIR
           DOC "Xerces-C++ include directory")
 mark_as_advanced(XercesC_INCLUDE_DIR)
 
-# Find all XercesC libraries
-find_library(XercesC_LIBRARY NAMES "xerces-c" "xerces-c_3" "xerces-c_2"
-  DOC "Xerces-C++ libraries")
-mark_as_advanced(XercesC_LIBRARY)
+if(NOT XercesC_LIBRARY)
+  # Find all XercesC libraries
+  find_library(XercesC_LIBRARY_RELEASE
+               NAMES "xerces-c" "xerces-c_3"
+               DOC "Xerces-C++ libraries (release)")
+  find_library(XercesC_LIBRARY_DEBUG
+               NAMES "xerces-cd" "xerces-c_3D"
+               DOC "Xerces-C++ libraries (debug)")
+  include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+  select_library_configurations(XercesC)
+  mark_as_advanced(XercesC_LIBRARY_RELEASE XercesC_LIBRARY_DEBUG)
+endif()
 
 if(XercesC_INCLUDE_DIR)
   _XercesC_GET_VERSION("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindXercesC-updates.rst |    5 +++++
 Modules/FindXercesC.cmake                |   16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/FindXercesC-updates.rst


hooks/post-receive
-- 
CMake