From 2dfc4099b6ccce97e1203f76b989337c69102390 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 16 Mar 2020 12:24:16 +0100 Subject: [PATCH] CMake: use XercesC_LIBRARIES to store debug and release version of xerces --- cMake/UseLibPackCLbundler.cmake | 5 +++-- src/Base/CMakeLists.txt | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cMake/UseLibPackCLbundler.cmake b/cMake/UseLibPackCLbundler.cmake index 7787a0ed68..f5955babf1 100644 --- a/cMake/UseLibPackCLbundler.cmake +++ b/cMake/UseLibPackCLbundler.cmake @@ -50,8 +50,9 @@ set (Qt5XmlPatterns_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5XmlPatterns CACHE PATH "") endif (BUILD_QT5) -find_library(XercesC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") -find_library(XercesC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib") +find_library(XercesC_LIBRARY_RELEASE xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") +find_library(XercesC_LIBRARY_DEBUG xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib") +set (XercesC_LIBRARIES debug ${XercesC_LIBRARY_DEBUG} optimized ${XercesC_LIBRARY_RELEASE}) set(XercesC_FOUND TRUE) find_library(COIN3D_LIBRARY_RELEASE coin4 "${FREECAD_LIBPACK_DIR}/lib") diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 0654f581de..60e632d752 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -20,8 +20,7 @@ include_directories( if(MSVC) set(FreeCADBase_LIBS ${Boost_LIBRARIES} - debug ${XercesC_DEBUG_LIBRARIES} - optimized ${XercesC_LIBRARIES} + ${XercesC_LIBRARIES} ${ZLIB_LIBRARIES} debug MSVCRTD.LIB debug MSVCPRTD.LIB