From 70202c842c5bc085c4d62374a93a3dc650b50b09 Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Wed, 14 Feb 2024 17:33:51 -0500 Subject: [PATCH] [irods/irods_7220] Do not explicitly build against libc++ --- CMakeLists.txt | 1 - irods_consortium_continuous_integration_build_hook.py | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 556b094..7af4603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ endif() set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) include(GNUInstallDirs) -include(UseLibCXX) find_package(nlohmann_json "3.6.1" REQUIRED) find_package(fmt "8.1.1" diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py index 6b64414..5f38a7b 100644 --- a/irods_consortium_continuous_integration_build_hook.py +++ b/irods_consortium_continuous_integration_build_hook.py @@ -14,12 +14,11 @@ def add_cmake_to_front_of_path(): def install_building_dependencies(externals_directory): externals_list = [ - 'irods-externals-avro1.11.0-2', - 'irods-externals-boost1.81.0-0', - 'irods-externals-clang-runtime13.0.0-0', - 'irods-externals-clang13.0.0-0', + 'irods-externals-avro1.11.0-3', + 'irods-externals-boost1.81.0-1', + 'irods-externals-clang13.0.1-0', 'irods-externals-cmake3.21.4-0', - 'irods-externals-fmt8.1.1-0', + 'irods-externals-fmt8.1.1-1', 'irods-externals-json3.10.4-0', 'irods-externals-libarchive3.5.2-0' ]