diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:46 +0800 |
| commit | f900a9ae67c61b3e53c36c119440cbc3710a2f7c (patch) | |
| tree | 341a78d70c88e414f501a4023318ceabb338d6ec /indra/cmake/APR.cmake | |
| parent | c06c7e0b0eb4b7a7aaa70a3559b08b18c73aea17 (diff) | |
| parent | 060bebcd3cbb5fbf6045bd777364947a2d8963d3 (diff) | |
Merge branch 'main' into 2025.04
Diffstat (limited to 'indra/cmake/APR.cmake')
| -rw-r--r-- | indra/cmake/APR.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 78c536e9d4..cf31027c9a 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -5,14 +5,12 @@ include_guard() add_library( ll::apr INTERFACE IMPORTED ) -if (USESYSTEMLIBS) - 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 () +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 () use_system_binary( apr apr-util ) use_prebuilt_binary(apr_suite) |