summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/APR.cmake2
-rw-r--r--indra/cmake/Audio.cmake2
-rw-r--r--indra/cmake/OPENAL.cmake2
-rw-r--r--indra/cmake/xxHash.cmake2
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 506f792570..78c536e9d4 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -5,7 +5,7 @@ include_guard()
add_library( ll::apr INTERFACE IMPORTED )
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
include(FindPkgConfig)
pkg_check_modules(Apr REQUIRED apr-1 apr-util-1)
target_include_directories(ll::apr SYSTEM INTERFACE ${Apr_INCLUDE_DIRS})
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 3c4c0ef1a7..514d283e76 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -5,7 +5,7 @@ include(Prebuilt)
include_guard()
add_library( ll::vorbis INTERFACE IMPORTED )
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
include(FindPkgConfig)
pkg_check_modules(Vorbis REQUIRED ogg vorbis vorbisenc vorbisfile)
target_include_directories(ll::vorbis SYSTEM INTERFACE ${Vorbis_INCLUDE_DIRS})
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 6555027dc1..f2eb956e2e 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -19,7 +19,7 @@ endif()
if (USE_OPENAL)
add_library( ll::openal INTERFACE IMPORTED )
- if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+ if (USESYSTEMLIBS)
target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
include(FindPkgConfig)
pkg_check_modules(Openal REQUIRED freealut)
diff --git a/indra/cmake/xxHash.cmake b/indra/cmake/xxHash.cmake
index 2dcab005ba..7e113feda2 100644
--- a/indra/cmake/xxHash.cmake
+++ b/indra/cmake/xxHash.cmake
@@ -6,7 +6,7 @@ set (XXHASH_CMAKE_INCLUDED TRUE)
include(Prebuilt)
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+if (USESYSTEMLIBS)
include(FindPkgConfig)
pkg_check_modules(Xxhash REQUIRED libxxhash)
return ()