From 3f31d0b5a70af4ebf746d40d478b4e948e904a87 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Sun, 17 Jul 2022 17:51:25 +0200
Subject: [PATCH] Be more explicit: Rename use_conan_binary to
use_system_binary, this will allow us to reuse the macro for more than just
conan.
---
indra/CMakeLists.txt | 8 +++++---
indra/cmake/APR.cmake | 2 +-
indra/cmake/Audio.cmake | 2 +-
indra/cmake/CURL.cmake | 2 +-
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/DBusGlib.cmake | 6 +++---
indra/cmake/EXPAT.cmake | 2 +-
indra/cmake/FreeType.cmake | 2 +-
indra/cmake/GLEXT.cmake | 2 +-
indra/cmake/GLH.cmake | 2 +-
indra/cmake/GStreamer010Plugin.cmake | 2 +-
indra/cmake/Hunspell.cmake | 2 +-
indra/cmake/JPEG.cmake | 2 +-
indra/cmake/JsonCpp.cmake | 2 +-
indra/cmake/LLPrimitive.cmake | 2 +-
indra/cmake/LLWindow.cmake | 4 ++--
indra/cmake/MESHOPTIMIZER.cmake | 2 +-
indra/cmake/NGHTTP2.cmake | 2 +-
indra/cmake/OpenJPEG.cmake | 2 +-
indra/cmake/OpenSSL.cmake | 2 +-
indra/cmake/PNG.cmake | 2 +-
indra/cmake/Prebuilt.cmake | 2 +-
indra/cmake/Tracy.cmake | 2 +-
indra/cmake/URIPARSER.cmake | 2 +-
indra/cmake/XmlRpcEpi.cmake | 2 +-
25 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 4bac78c2ef4..541e29bcbf5 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -17,11 +17,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_BINARY_DIR}"
include(conanbuildinfo OPTIONAL RESULT_VARIABLE USE_CONAN )
if( USE_CONAN )
- set( USE_CONAN ON )
- conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
- add_compile_definitions(LL_USESYSTEMLIBS USE_CONAN)
+ set( USE_CONAN ON )
+ set( USE_AUTOBUILD_3P OFF )
+ conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
+ add_compile_definitions(LL_USESYSTEMLIBS USE_CONAN NO_AUTOBUILD_3P)
else()
set( USE_CONAN OFF )
+ set( USE_AUTOBUILD_3P ON )
endif()
set(CXX_STANDARD 14)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 898979c47ed..8a0939c92c9 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -5,7 +5,7 @@ include_guard()
add_library( ll::apr INTERFACE IMPORTED )
-use_conan_binary( apr apr-util )
+use_system_binary( apr apr-util )
use_prebuilt_binary(apr_suite)
if (WINDOWS)
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 4b06de0a085..38547bb0172 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::vorbis INTERFACE IMPORTED )
-use_conan_binary(vorbis)
+use_system_binary(vorbis)
use_prebuilt_binary(ogg_vorbis)
target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 7c93819e752..b9f685f37bf 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::libcurl INTERFACE IMPORTED )
-use_conan_binary(libcurl)
+use_system_binary(libcurl)
use_prebuilt_binary(curl)
if (WINDOWS)
target_link_libraries(ll::libcurl INTERFACE libcurl.lib)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c894b40a535..e43d4757bb1 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -210,7 +210,7 @@ elseif(LINUX)
${EXPAT_COPY}
)
- if( NOT USE_CONAN )
+ if( USE_AUTOBUILD_3P )
list( APPEND release_files
libapr-1.so.0
libaprutil-1.so.0
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index 9151742fe05..f75018ad0e9 100644
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -3,11 +3,11 @@ include(Prebuilt)
add_library( ll::dbus INTERFACE IMPORTED)
-# Only define this when using conan, lls prebuild is broken
-if( USE_CONAN )
+# Only define this when not using the prebuild 3ps, lls prebuild is broken
+if( NOT USE_AUTOBUILD_3P )
target_compile_definitions( ll::dbus INTERFACE LL_DBUS_ENABLED )
endif()
-use_conan_binary(dbus)
+use_system_binary(dbus)
use_prebuilt_binary(dbus_glib)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index e5c9dd55826..327fe8aa72b 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::expat INTERFACE IMPORTED )
-use_conan_binary(expat)
+use_system_binary(expat)
use_prebuilt_binary(expat)
if (WINDOWS)
target_link_libraries( ll::expat INTERFACE libexpatMT )
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 92130402f93..77140af6413 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::freetype INTERFACE IMPORTED )
-use_conan_binary(freetype)
+use_system_binary(freetype)
use_prebuilt_binary(freetype)
target_include_directories( ll::freetype SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/freetype2/)
target_link_libraries( ll::freetype INTERFACE freetype )
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index 70477cf0afa..434b6f0ee84 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -4,7 +4,7 @@ include(GLH)
add_library( ll::glext INTERFACE IMPORTED )
if (WINDOWS OR LINUX)
- use_conan_binary(glext)
+ use_system_binary(glext)
use_prebuilt_binary(glext)
endif (WINDOWS OR LINUX)
diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
index 18521b50691..0cefc3543ad 100644
--- a/indra/cmake/GLH.cmake
+++ b/indra/cmake/GLH.cmake
@@ -3,5 +3,5 @@ include(Prebuilt)
add_library( ll::glh_linear INTERFACE IMPORTED )
-use_conan_binary( glh_linear )
+use_system_binary( glh_linear )
use_prebuilt_binary(glh_linear)
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index 0b6a7a21c35..61f6f740336 100644
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -6,7 +6,7 @@ endif()
add_library( ll::gstreamer INTERFACE IMPORTED )
target_compile_definitions( ll::gstreamer INTERFACE LL_GSTREAMER010_ENABLED=1)
-use_conan_binary(gstreamer)
+use_system_binary(gstreamer)
use_prebuilt_binary(gstreamer)
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index 6e92611cc9a..bb037c0237b 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -5,7 +5,7 @@ include_guard()
use_prebuilt_binary(dictionaries)
add_library( ll::hunspell INTERFACE IMPORTED )
-use_conan_binary(hunspell)
+use_system_binary(hunspell)
use_prebuilt_binary(libhunspell)
if (WINDOWS)
target_link_libraries( ll::hunspell INTERFACE libhunspell)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 900fc77c401..252d7852d4e 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -6,7 +6,7 @@ include(Linking)
include_guard()
add_library( ll::libjpeg INTERFACE IMPORTED )
-use_conan_binary(libjpeg)
+use_system_binary(libjpeg)
use_prebuilt_binary(jpeglib)
if (LINUX)
target_link_libraries( ll::libjpeg INTERFACE jpeg)
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index f62b2bdd7a3..17f8e47a978 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::jsoncpp INTERFACE IMPORTED )
-use_conan_binary(jsoncpp)
+use_system_binary(jsoncpp)
use_prebuilt_binary(jsoncpp)
if (WINDOWS)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 3e5ff4963b3..04afe5e4054 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -18,7 +18,7 @@ if( USE_CONAN )
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
endif()
-use_conan_binary( colladadom )
+use_system_binary( colladadom )
use_prebuilt_binary(colladadom)
use_prebuilt_binary(minizip-ng) # needed for colladadom
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 0136d567230..b36e9705607 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -9,10 +9,10 @@ add_library( ll::SDL INTERFACE IMPORTED )
if (LINUX)
- #Must come first as use_conan_binary can exit this file early
+ #Must come first as use_system_binary can exit this file early
target_compile_definitions( ll::SDL INTERFACE LL_SDL=1)
- use_conan_binary(SDL)
+ use_system_binary(SDL)
use_prebuilt_binary(SDL)
target_include_directories( ll::SDL SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
index 0d51f47866b..d1d4df067f5 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -6,7 +6,7 @@ include(Prebuilt)
include_guard()
add_library( ll::meshoptimizer INTERFACE IMPORTED )
-use_conan_binary(meshoptimizer)
+use_system_binary(meshoptimizer)
use_prebuilt_binary(meshoptimizer)
if (WINDOWS)
diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake
index 27f273674b2..6396a5bd016 100644
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::nghttp2 INTERFACE IMPORTED )
-use_conan_binary(nghttp2)
+use_system_binary(nghttp2)
use_prebuilt_binary(nghttp2)
if (WINDOWS)
target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index b016c22a4eb..f0311439bf1 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::openjpeg INTERFACE IMPORTED )
-use_conan_binary(openjpeg)
+use_system_binary(openjpeg)
use_prebuilt_binary(openjpeg)
target_link_libraries(ll::openjpeg INTERFACE openjpeg )
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 0d3f3ad9b46..3387c74f453 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::openssl INTERFACE IMPORTED )
-use_conan_binary(openssl)
+use_system_binary(openssl)
use_prebuilt_binary(openssl)
if (WINDOWS)
target_link_libraries(ll::openssl INTERFACE libssl libcrypto)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 8e870f631fb..044262bc8d8 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::libpng INTERFACE IMPORTED )
-use_conan_binary(libpng)
+use_system_binary(libpng)
use_prebuilt_binary(libpng)
if (WINDOWS)
target_link_libraries(ll::libpng INTERFACE libpng16)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 542b4462e48..f0239711aa4 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -58,7 +58,7 @@ macro (use_prebuilt_binary _binary)
endmacro (use_prebuilt_binary _binary)
#Sadly we need a macro here, otherwise the return() will not properly work
-macro ( use_conan_binary package )
+macro ( use_system_binary package )
if( USE_CONAN )
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${package} )
foreach( extra_pkg "${ARGN}" )
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index c7563f1b7e9..b3de06a876b 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -7,7 +7,7 @@ add_library( ll::tracy INTERFACE IMPORTED )
set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
if (USE_TRACY)
- use_conan_binary(tracy)
+ use_system_binary(tracy)
use_prebuilt_binary(tracy)
target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index b1c76c006aa..6c33ff70e10 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -6,7 +6,7 @@ include(Prebuilt)
add_library( ll::uriparser INTERFACE IMPORTED )
-use_conan_binary( uriparser )
+use_system_binary( uriparser )
use_prebuilt_binary(uriparser)
if (WINDOWS)
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 7cb0efdab77..6409f9d6e26 100644
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
include_guard()
add_library( ll::xmlrpc-epi INTERFACE IMPORTED )
-use_conan_binary( xmlrpc-epi )
+use_system_binary( xmlrpc-epi )
use_prebuilt_binary(xmlrpc-epi)
target_link_libraries(ll::xmlrpc-epi INTERFACE xmlrpc-epi )
--
GitLab