From e6fa358bc79a287fad7814951f7f2da028c43440 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 26 Dec 2022 21:32:17 -0500
Subject: [PATCH] Fix linux CI build
---
indra/cmake/APR.cmake | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 8fe4144a28f..94de0bec6d3 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -25,7 +25,7 @@ else (USESYSTEMLIBS)
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
)
- else()
+ elseif(DARWIN)
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
@@ -35,6 +35,15 @@ else (USESYSTEMLIBS)
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ${APRICONV_LIBRARIES}
)
+ else()
+ set(APR_LIBRARIES
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+ )
+ set(APRUTIL_LIBRARIES
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
+ )
endif ()
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
--
GitLab