diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
commit | d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e (patch) | |
tree | 7c2023e55955c9aed55db9331bae164a386a2d21 /indra/cmake/APR.cmake | |
parent | 6641e36082f27faa282a0af6f88f381ffc97e179 (diff) | |
parent | 11d75418fce8372e9976b069070d9d0506766d0d (diff) |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake/APR.cmake')
-rw-r--r-- | indra/cmake/APR.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 78c536e9d4..fa3b8a4ffb 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -5,15 +5,20 @@ include_guard() add_library( ll::apr INTERFACE IMPORTED ) -if (USESYSTEMLIBS) +if (WINDOWS) + target_include_directories(ll::apr SYSTEM INTERFACE ${prefix_result}/../include) + target_link_directories(ll::apr INTERFACE ${prefix_result}) + target_link_libraries(ll::apr INTERFACE apr-1 apr-util-1) +else () include(FindPkgConfig) pkg_check_modules(Apr REQUIRED apr-1 apr-util-1) target_include_directories(ll::apr SYSTEM INTERFACE ${Apr_INCLUDE_DIRS}) target_link_directories(ll::apr INTERFACE ${Apr_LIBRARY_DIRS}) target_link_libraries(ll::apr INTERFACE ${Apr_LIBRARIES}) - return () endif () +return () + use_system_binary( apr apr-util ) use_prebuilt_binary(apr_suite) |