From 1f8dde71118ee0e9928913544f5aebe44247246d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 15 Aug 2024 06:29:30 +0800 Subject: Make packages/lib/release directory automatically cause it's needed at least on macOS, where the command to install the FMOD (which is the one done earliest) library is execute_process(COMMAND lipo), and not file(COPY) that would imply a mkdir. --- indra/cmake/FMODSTUDIO.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake') diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake index a8bf087ece..313ee2cde7 100644 --- a/indra/cmake/FMODSTUDIO.cmake +++ b/indra/cmake/FMODSTUDIO.cmake @@ -31,6 +31,7 @@ if (USE_FMODSTUDIO) # as accessing the private LL location will fail if you don't have the credential include(Prebuilt) if (USESYSTEMLIBS AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/fmodstudio_installed OR NOT ${fmodstudio_installed} EQUAL 0)) + file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release) if (DARWIN) execute_process( COMMAND hdiutil attach -noverify fmodstudioapi20223mac-installer.dmg -- cgit v1.2.3 From ddd92b44c4248f90d6f1eca653fa9763ec766b80 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 15 Aug 2024 06:41:59 +0800 Subject: Make sure OpenSSL is built before CURL LLCoreHttp.cmake is included earlier (by llappearance/CMakeLists.txt), before llcorehttp/CMakeLists.txt (even though it includes LLCoreHttp.cmake in return). --- indra/cmake/LLCoreHttp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake index 22ed5fef9c..5464e4d327 100644 --- a/indra/cmake/LLCoreHttp.cmake +++ b/indra/cmake/LLCoreHttp.cmake @@ -1,5 +1,5 @@ # -*- cmake -*- -include(CURL) include(OpenSSL) +include(CURL) include(NGHTTP2) -- cgit v1.2.3