From 725e52b723b6c3894206c553b8e4cc24223a0af7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 3 Aug 2021 04:04:16 -0400
Subject: [PATCH] Fix windows linking
---
indra/llcommon/CMakeLists.txt | 1 +
indra/llfilesystem/CMakeLists.txt | 2 ++
indra/llmessage/CMakeLists.txt | 7 +++++++
indra/llui/CMakeLists.txt | 4 ++++
indra/newview/CMakeLists.txt | 3 ++-
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 0ca384b10e1..b2da8b8a037 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -301,6 +301,7 @@ target_link_libraries(
absl::node_hash_map
absl::random_random
absl::random_bit_gen_ref
+ absl::strings
nlohmann_json::nlohmann_json
fmt::fmt
${DL_LIBRARY}
diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt
index 18a3beb1278..ac86f59c107 100644
--- a/indra/llfilesystem/CMakeLists.txt
+++ b/indra/llfilesystem/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llfilesystem)
include(00-Common)
include(LLCommon)
+include(Abseil)
include(UnixInstall)
include_directories(
@@ -71,6 +72,7 @@ set(cache_BOOST_LIBRARIES
target_link_libraries(llfilesystem
${LLCOMMON_LIBRARIES}
${cache_BOOST_LIBRARIES}
+ absl::strings
)
if (WINDOWS)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 80669d91aa0..4f18a79cc97 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -3,6 +3,7 @@
project(llmessage)
include(00-Common)
+include(Abseil)
include(CURL)
include(OpenSSL)
include(NGHTTP2)
@@ -219,6 +220,9 @@ target_link_libraries(
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
+ absl::flat_hash_map
+ absl::node_hash_map
+ absl::strings
rt
)
else (LINUX)
@@ -236,6 +240,9 @@ target_link_libraries(
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
+ absl::flat_hash_map
+ absl::node_hash_map
+ absl::strings
)
endif(LINUX)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 435d4dca5fb..c9f1a55af42 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -3,6 +3,7 @@
project(llui)
include(00-Common)
+include(Abseil)
include(Hunspell)
include(LLCommon)
include(LLImage)
@@ -290,6 +291,9 @@ target_link_libraries(llui
${HUNSPELL_LIBRARY}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
+ absl::flat_hash_map
+ absl::node_hash_map
+ absl::strings
)
if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ee92bacc8e6..a81d3c33758 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -7,6 +7,7 @@ include(00-Common)
# sets variables on which the 3p .cmake files depend.
include(Linking)
+include(Abseil)
include(Boost)
include(bugsplat)
include(BuildPackagesInfo)
@@ -54,7 +55,6 @@ include(ViewerManager)
include(VisualLeakDetector)
include(ZLIB)
include(URIPARSER)
-include(Abseil)
if( LLPHYSICSEXTENSIONS_SRC_DIR )
if (NOT HAVOK_TPV)
@@ -2153,6 +2153,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${MINIZIP_LIBRARIES}
absl::flat_hash_map
absl::node_hash_map
+ absl::strings
nlohmann_json::nlohmann_json
fmt::fmt
)
--
GitLab