Skip to content

Commit b0e36e5

Browse files
mkschulzeclaude
andcommitted
fix(cmake): don't override OPENSSL_ROOT_DIR when already set
The Homebrew fallback was using FORCE, overriding the universal static OpenSSL passed via -DOPENSSL_ROOT_DIR from CI. Only apply the Homebrew fallback when no root dir was explicitly provided. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fa66ab8 commit b0e36e5

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ if(WIN32)
8585
endif()
8686

8787
# ── OpenSSL (for AES-256-CBC encryption, SHA-256 key derivation — Phase 15) ──
88-
if(APPLE)
89-
# Help CMake find Homebrew OpenSSL on macOS (not in default search path)
88+
if(APPLE AND NOT OPENSSL_ROOT_DIR)
89+
# Fallback: help CMake find Homebrew OpenSSL on macOS (not in default search path)
9090
execute_process(COMMAND brew --prefix openssl@3
9191
OUTPUT_VARIABLE OPENSSL_BREW_PREFIX
9292
OUTPUT_STRIP_TRAILING_WHITESPACE
9393
ERROR_QUIET
9494
)
9595
if(OPENSSL_BREW_PREFIX)
96-
set(OPENSSL_ROOT_DIR "${OPENSSL_BREW_PREFIX}" CACHE PATH "OpenSSL root" FORCE)
96+
set(OPENSSL_ROOT_DIR "${OPENSSL_BREW_PREFIX}" CACHE PATH "OpenSSL root")
9797
endif()
9898
endif()
9999
find_package(OpenSSL REQUIRED)
@@ -338,4 +338,8 @@ if(JAMWIDE_BUILD_TESTS)
338338
target_link_libraries(test_encryption PRIVATE njclient OpenSSL::Crypto)
339339
add_test(NAME encryption COMMAND test_encryption)
340340

341+
add_executable(test_video_sync tests/test_video_sync.cpp)
342+
target_include_directories(test_video_sync PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
343+
add_test(NAME video_sync COMMAND test_video_sync)
344+
341345
endif()

0 commit comments

Comments
 (0)