From 542b3d36430ca2b91147532167507248aa6407f0 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Fri, 19 Dec 2025 03:09:20 -0500 Subject: [PATCH] stop download of prebuilt libs when using override Fix bug where prebuilt libs were downloaded even when an override was used. --- lib/prebuilt.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/prebuilt.cmake b/lib/prebuilt.cmake index e2d756d9650..c97d3ef95be 100644 --- a/lib/prebuilt.cmake +++ b/lib/prebuilt.cmake @@ -6,12 +6,12 @@ set(PREBUILT_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/prebuilt") set(CURRENT_ROOT "${CMAKE_CURRENT_BINARY_DIR}") function(get_prebuilt_path OUT_VAR) - if (IS_DIRECTORY "${PREBUILT_LIB_DIR}") - if (NOT "${FSO_PREBUILT_OVERRIDE}" STREQUAL "") - set(${OUT_VAR} "${FSO_PREBUILT_OVERRIDE}" PARENT_SCOPE) - return() - endif() + if (NOT "${FSO_PREBUILT_OVERRIDE}" STREQUAL "" AND IS_DIRECTORY "${FSO_PREBUILT_OVERRIDE}") + set(${OUT_VAR} "${FSO_PREBUILT_OVERRIDE}" PARENT_SCOPE) + return() + endif() + if (IS_DIRECTORY "${PREBUILT_LIB_DIR}") if ("${DOWNLOADED_PREBUILT_VERSION}" STREQUAL "${PREBUILT_VERSION_NAME}") # Libraries already downloaded and up-to-date set(${OUT_VAR} "${PREBUILT_LIB_DIR}" PARENT_SCOPE)