diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-09-18 15:23:26 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-09-18 15:23:26 -0400 |
| commit | 82e431e0906647dcfc4a64b057e6bc305c9add8e (patch) | |
| tree | 9a1431c0c311de41388879b31f26c6faa8bf5e89 /indra/cmake/NGHTTP2.cmake | |
| parent | badeccbebcfa73a11cf0f8a4562c9a0d386834c1 (diff) | |
| parent | bf0f60039b33bb0b1f93431864fd6b51c2a20b5b (diff) | |
Merge remote-tracking branch 'origin/release/2025.07' into geenz/2025.07-develop
Diffstat (limited to 'indra/cmake/NGHTTP2.cmake')
| -rw-r--r-- | indra/cmake/NGHTTP2.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake index 7b2aa5971f..e81204d716 100644 --- a/indra/cmake/NGHTTP2.cmake +++ b/indra/cmake/NGHTTP2.cmake @@ -6,9 +6,12 @@ add_library( ll::nghttp2 INTERFACE IMPORTED ) use_system_binary(nghttp2) use_prebuilt_binary(nghttp2) -if (WINDOWS) - target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib) -else () - target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a) -endif () + +find_library(NGHTTP2_LIBRARY + NAMES + nghttp2.lib + libnghttp2.a + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) + +target_link_libraries(ll::nghttp2 INTERFACE ${NGHTTP2_LIBRARY}) target_include_directories( ll::nghttp2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/nghttp2) |