From 05e4a973ff0820a25c5b957c5a7936a33d3febb0 Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Wed, 14 Feb 2024 17:26:19 -0500 Subject: [PATCH] [irods/irods#7220] Do not explicitly build against libc++ --- CMakeLists.txt | 1 - irods_consortium_continuous_integration_build_hook.py | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5640da5..e896001 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ project(irods_capability-storage_tiering include(${IRODS_TARGETS_PATH}) include(GNUInstallDirs) -include(UseLibCXX) if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build {Debug, Release}." FORCE) diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py index 4bd94bc..3f4a1f2 100644 --- a/irods_consortium_continuous_integration_build_hook.py +++ b/irods_consortium_continuous_integration_build_hook.py @@ -15,11 +15,10 @@ def add_cmake_to_front_of_path(): def install_building_dependencies(externals_directory): externals_list = [ - 'irods-externals-boost1.81.0-0', - 'irods-externals-clang-runtime13.0.0-0', - 'irods-externals-clang13.0.0-0', + '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' ] if externals_directory == 'None' or externals_directory is None: