diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-26 12:24:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-26 12:24:16 (GMT) |
| commit | b6d9c3e459ba6b58d3e21296c7c6eddfd0dceb39 (patch) | |
| tree | eb701be499b0fa76d3480d27f0610422d57676dd | |
| parent | c7d067626d2d738f79b5848e42ab96da0e79cfbd (diff) | |
| parent | b59c127df26fe65a46311cf0a825064a030ef412 (diff) | |
| download | CMake-b6d9c3e459ba6b58d3e21296c7c6eddfd0dceb39.zip CMake-b6d9c3e459ba6b58d3e21296c7c6eddfd0dceb39.tar.gz CMake-b6d9c3e459ba6b58d3e21296c7c6eddfd0dceb39.tar.bz2 | |
Merge topic 'xerces-cygwin-library-naming'
b59c127df2 FindXercesC: Find Cygwin libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4783
| -rw-r--r-- | Modules/FindXercesC.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake index 47bfd62..db78b61 100644 --- a/Modules/FindXercesC.cmake +++ b/Modules/FindXercesC.cmake @@ -81,10 +81,14 @@ endif() if(NOT XercesC_LIBRARY) # Find all XercesC libraries find_library(XercesC_LIBRARY_RELEASE - NAMES "xerces-c" "xerces-c_${XercesC_VERSION_MAJOR}" + NAMES "xerces-c" + "xerces-c_${XercesC_VERSION_MAJOR}" + "xerces-c-${XercesC_VERSION_MAJOR}.${XercesC_VERSION_MINOR}" DOC "Xerces-C++ libraries (release)") find_library(XercesC_LIBRARY_DEBUG - NAMES "xerces-cd" "xerces-c_${XercesC_VERSION_MAJOR}D" "xerces-c_${XercesC_VERSION_MAJOR}_${XercesC_VERSION_MINOR}D" + NAMES "xerces-cd" + "xerces-c_${XercesC_VERSION_MAJOR}D" + "xerces-c_${XercesC_VERSION_MAJOR}_${XercesC_VERSION_MINOR}D" DOC "Xerces-C++ libraries (debug)") include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(XercesC) |