From 76f0e2f8ea4e7e4a88735b5b550cb132421d551a Mon Sep 17 00:00:00 2001 From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch> Date: Sat, 25 Jan 2025 10:43:48 +0100 Subject: [PATCH] Use cmake for Xerec compilation && update MD5 --- cmake/SetupXercesC.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/SetupXercesC.cmake b/cmake/SetupXercesC.cmake index 0f288e48..16e0db05 100644 --- a/cmake/SetupXercesC.cmake +++ b/cmake/SetupXercesC.cmake @@ -33,15 +33,15 @@ if(GEOMODEL_USE_BUILTIN_XERCESC) ExternalProject_Add( XercesCBuiltIn PREFIX "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCBuild" INSTALL_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall" - URL "https://github.com/apache/xerces-c/archive/refs/tags/${XercesC_VERSION}.tar.gz" - URL_MD5 "a5fa4d920fce31c9ca3bfef241644494" - CONFIGURE_COMMAND - ${CMAKE_COMMAND} -E env CXXFLAGS=-std=c++${CMAKE_CXX_STANDARD} <SOURCE_DIR>/configure --disable-static --prefix=<INSTALL_DIR> + URL "https://github.com/apache/xerces-c/archive/refs/tags/v${XercesC_VERSION}.tar.gz" + URL_MD5 "9662878f56e5bc1eb7a9b4c572d37a1d" + CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> INSTALL_COMMAND make install COMMAND ${CMAKE_COMMAND} -E remove -f "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib/${CMAKE_SHARED_LIBRARY_PREFIX}xerces-c.la" COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib/pkgconfig" - BUILD_BYPRODUCTS "${XercesC_INCLUDE_DIR}" "${XercesC_LIBRARY}" ) - install(DIRECTORY + BUILD_BYPRODUCTS "${XercesC_INCLUDE_DIR}" ) + + install(DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/bin" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib" DESTINATION . -- GitLab