diff options
| -rw-r--r-- | indra/cmake/APR.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Audio.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/OPENAL.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/xxHash.cmake | 2 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/llimage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 2 |
7 files changed, 8 insertions, 8 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 () diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index a76a134ec6..6aec3aada7 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -8,7 +8,7 @@ include(bugsplat) include(Linking) include(Boost) include(LLSharedLibs) -if (USE_AUTOBUILD_3P OR USE_CONAN) +if (NOT USESYSTEMLIBS) include(Copy3rdPartyLibs) endif () include(ZLIBNG) @@ -306,7 +306,7 @@ if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR (${LIN target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include) endif () -if (USE_AUTOBUILD_3P OR USE_CONAN) +if (NOT USESYSTEMLIBS) add_dependencies(llcommon stage_third_party_libs) else () target_compile_options(${PROJECT_NAME} PUBLIC -Wno-deprecated-declarations) diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index f55d9fdf5e..30a79076ab 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -67,7 +67,7 @@ target_link_libraries(llimage ll::libjpeg ) -if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) +if (USESYSTEMLIBS) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") set_source_files_properties(llimageworker.cpp PROPERTIES COMPILE_FLAGS -Wno-int-in-bool-context) set_source_files_properties( diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 5ca62352a3..43e9c580dc 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -197,7 +197,7 @@ target_link_libraries( ) target_include_directories( llmessage INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) +if (USESYSTEMLIBS) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") set_source_files_properties(llnamevalue.cpp PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation) |