summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-17 14:24:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-17 14:24:55 (GMT)
commit9cba05c6845ececd68f3f57c50c1953658ba48be (patch)
tree6425e8807539544b91eb22c9cc8e9ecfc78f29e5 /Modules
parent8ca1c2b2b351ee7c600a041cc31d36cfe9d16d30 (diff)
parentdb292564293ce6899728fa172614d4eec59b429f (diff)
downloadCMake-9cba05c6845ececd68f3f57c50c1953658ba48be.zip
CMake-9cba05c6845ececd68f3f57c50c1953658ba48be.tar.gz
CMake-9cba05c6845ececd68f3f57c50c1953658ba48be.tar.bz2
Merge topic 'FindXercesC-updates'
db292564 FindXercesC: Add support for 3D_1 variant of the library 021bf871 FindXercesC: Find debug and release libraries separately
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindXercesC.cmake16
1 files changed, 12 insertions, 4 deletions
diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index fd0b992..cf84826 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" "xerces-c_3_1D"
+ 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")