[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-998-gc8be06c

Brad King brad.king at kitware.com
Mon Jul 13 09:10:28 EDT 2015


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  c8be06c52ddfc10355d00dececf3e5e469bd1593 (commit)
       via  38ddabb194ec6b0ab19dcfac27378c6e91cbde02 (commit)
       via  c8f46af11b43719281a375ef7841830756022d76 (commit)
       via  e3f5e5d5b401c377719b89cb86c65131315a2582 (commit)
       via  b1e43a5647a978fc60b7845d85ebe000fa9f5d3b (commit)
      from  5f654be0342fa580f071501f51c2149b96a35231 (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=c8be06c52ddfc10355d00dececf3e5e469bd1593
commit c8be06c52ddfc10355d00dececf3e5e469bd1593
Merge: 5f654be 38ddabb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 13 09:10:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 13 09:10:28 2015 -0400

    Merge topic 'FindXercesC-versioned-library-2' into next
    
    38ddabb1 FindXercesC: Also search for xerces-c_2 (#15648)
    c8f46af1 CMake Nightly Date Stamp
    e3f5e5d5 CMake Nightly Date Stamp
    b1e43a56 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38ddabb194ec6b0ab19dcfac27378c6e91cbde02
commit 38ddabb194ec6b0ab19dcfac27378c6e91cbde02
Author:     Roger Leigh <r.leigh at dundee.ac.uk>
AuthorDate: Mon Jul 13 12:00:12 2015 +0100
Commit:     Roger Leigh <r.leigh at dundee.ac.uk>
CommitDate: Mon Jul 13 12:00:33 2015 +0100

    FindXercesC: Also search for xerces-c_2 (#15648)
    
    This is the previous stable release name used on Windows.

diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index 984f1b9..fd0b992 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -62,7 +62,7 @@ find_path(XercesC_INCLUDE_DIR
 mark_as_advanced(XercesC_INCLUDE_DIR)
 
 # Find all XercesC libraries
-find_library(XercesC_LIBRARY NAMES "xerces-c" "xerces-c_3"
+find_library(XercesC_LIBRARY NAMES "xerces-c" "xerces-c_3" "xerces-c_2"
   DOC "Xerces-C++ libraries")
 mark_as_advanced(XercesC_LIBRARY)
 

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

Summary of changes:
 Modules/FindXercesC.cmake |    2 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list