From 7a34da2ec4ab7320d5f3caf7cfc4880f83d70c55 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jan 2025 07:00:22 +0100 Subject: [PATCH 1/2] libxml2: support building on Windows as well Use the provided CMake build. --- projects/apple-unix/libxml2.cmake | 34 ------------------- projects/libxml2.cmake | 23 +++++++++++++ .../{apple-unix => }/libxml2.system.cmake | 0 selftest/CMakeLists.txt | 4 +-- 4 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 projects/apple-unix/libxml2.cmake create mode 100644 projects/libxml2.cmake rename projects/{apple-unix => }/libxml2.system.cmake (100%) diff --git a/projects/apple-unix/libxml2.cmake b/projects/apple-unix/libxml2.cmake deleted file mode 100644 index 39cc1ded7..000000000 --- a/projects/apple-unix/libxml2.cmake +++ /dev/null @@ -1,34 +0,0 @@ -if (BUILD_SHARED_LIBS) - set(libxml2_shared_args --enable-shared --disable-static) -else () - set(libxml2_shared_args --disable-shared --enable-static) -endif () - -superbuild_add_project(libxml2 - CAN_USE_SYSTEM - LICENSE_FILES - Copyright - SPDX_LICENSE_IDENTIFIER - MIT - SPDX_COPYRIGHT_TEXT - "Copyright (C) 1998-2012 Daniel Veillard" - CONFIGURE_COMMAND - /configure - --prefix= - --without-python - --without-icu - --without-lzma - --without-zlib - --without-modules - ${libxml2_shared_args} - BUILD_COMMAND - $(MAKE) - INSTALL_COMMAND - $(MAKE) install - BUILD_IN_SOURCE 1) - -if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET) - superbuild_append_flags(c_flags - "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}" - PROJECT_ONLY) -endif () diff --git a/projects/libxml2.cmake b/projects/libxml2.cmake new file mode 100644 index 000000000..92af3af40 --- /dev/null +++ b/projects/libxml2.cmake @@ -0,0 +1,23 @@ +set(libxml2_with_iconv ON) +if (WIN32) + set(libxml2_with_iconv OFF) +endif () + +superbuild_add_project(libxml2 + CAN_USE_SYSTEM + LICENSE_FILES + Copyright + SPDX_LICENSE_IDENTIFIER + MIT + SPDX_COPYRIGHT_TEXT + "Copyright (C) 1998-2012 Daniel Veillard" + CMAKE_ARGS + -DCMAKE_INSTALL_LIBDIR:STRING=lib + -DCMAKE_INSTALL_NAME_DIR:PATH=/lib + -DLIBXML2_WITH_PYTHON:BOOL=OFF + -DLIBXML2_WITH_ICONV:BOOL=${libxml2_with_iconv} + -DLIBXML2_WITH_ICU:BOOL=OFF + -DLIBXML2_WITH_LZMA:BOOL=OFF + -DLIBXML2_WITH_ZLIB:BOOL=OFF + -DLIBXML2_WITH_MODULES:BOOL=OFF + -DLIBXML2_WITH_TESTS:BOOL=OFF) diff --git a/projects/apple-unix/libxml2.system.cmake b/projects/libxml2.system.cmake similarity index 100% rename from projects/apple-unix/libxml2.system.cmake rename to projects/libxml2.system.cmake diff --git a/selftest/CMakeLists.txt b/selftest/CMakeLists.txt index fdad12632..1ba38e566 100644 --- a/selftest/CMakeLists.txt +++ b/selftest/CMakeLists.txt @@ -27,6 +27,7 @@ function (superbuild_find_projects var) jsoncpp lapack libjpegturbo + libxml2 llvm lz4 openmp @@ -133,8 +134,7 @@ function (superbuild_find_projects var) expat ffi ffmpeg - gperf - libxml2) + gperf) endif () if (NOT APPLE) -- GitLab From 58bb21e56ac7eba7dbab3d094dfad05c68986a5f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jan 2025 07:09:43 +0100 Subject: [PATCH 2/2] libxslt: add project --- .gitlab/ci/configure_common.cmake | 1 + projects/libxslt.cmake | 16 ++++++++++++++++ selftest/CMakeLists.txt | 1 + versions.cmake | 5 +++++ 4 files changed, 23 insertions(+) create mode 100644 projects/libxslt.cmake diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index a2577ad47..be8a01130 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -72,6 +72,7 @@ enable_project(jsoncpp) enable_project(lapack) enable_project(libjpegturbo) enable_project(libxml2) +enable_project(libxslt) enable_project(llvm) enable_project(lz4) enable_project(matplotlib) diff --git a/projects/libxslt.cmake b/projects/libxslt.cmake new file mode 100644 index 000000000..bd057152b --- /dev/null +++ b/projects/libxslt.cmake @@ -0,0 +1,16 @@ +superbuild_add_project(libxslt + DEPENDS + libxml2 + LICENSE_FILES + Copyright + SPDX_LICENSE_IDENTIFIER + MIT + SPDX_COPYRIGHT_TEXT + "Copyright (C) 2001-2002 Daniel Veillard" + CMAKE_ARGS + -DCMAKE_INSTALL_LIBDIR:STRING=lib + -DCMAKE_INSTALL_NAME_DIR:PATH=/lib + -DLIBXSLT_WITH_PYTHON:BOOL=OFF + -DLIBXSLT_WITH_LZMA:BOOL=OFF + -DLIBXSLT_WITH_MODULES:BOOL=OFF + -DLIBXSLT_WITH_TESTS:BOOL=OFF) diff --git a/selftest/CMakeLists.txt b/selftest/CMakeLists.txt index 1ba38e566..d318b73c8 100644 --- a/selftest/CMakeLists.txt +++ b/selftest/CMakeLists.txt @@ -28,6 +28,7 @@ function (superbuild_find_projects var) lapack libjpegturbo libxml2 + libxslt llvm lz4 openmp diff --git a/versions.cmake b/versions.cmake index 85aadc11d..5474858dd 100644 --- a/versions.cmake +++ b/versions.cmake @@ -109,6 +109,11 @@ superbuild_set_revision(libxml2 URL "https://www.paraview.org/files/dependencies/libxml2-2.11.5.tar.xz" URL_MD5 b2e7332289f5784087448a0717f45ac3) +superbuild_set_revision(libxslt + # https://download.gnome.org/sources/libxslt/ + URL "https://www.paraview.org/files/dependencies/libxslt-1.1.42.tar.xz" + URL_MD5 56bc5d89aa39d62002961c150fec08a0) + superbuild_set_revision(nlohmannjson # https://github.com/nlohmann/json/releases # Be sure to grab the full source code, not one of the subdirectory archives. -- GitLab