Skip to content
Snippets Groups Projects
Commit 725e52b7 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix windows linking

parent a90f3d1e
No related branches found
No related tags found
No related merge requests found
...@@ -301,6 +301,7 @@ target_link_libraries( ...@@ -301,6 +301,7 @@ target_link_libraries(
absl::node_hash_map absl::node_hash_map
absl::random_random absl::random_random
absl::random_bit_gen_ref absl::random_bit_gen_ref
absl::strings
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
fmt::fmt fmt::fmt
${DL_LIBRARY} ${DL_LIBRARY}
......
...@@ -4,6 +4,7 @@ project(llfilesystem) ...@@ -4,6 +4,7 @@ project(llfilesystem)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(Abseil)
include(UnixInstall) include(UnixInstall)
include_directories( include_directories(
...@@ -71,6 +72,7 @@ set(cache_BOOST_LIBRARIES ...@@ -71,6 +72,7 @@ set(cache_BOOST_LIBRARIES
target_link_libraries(llfilesystem target_link_libraries(llfilesystem
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${cache_BOOST_LIBRARIES} ${cache_BOOST_LIBRARIES}
absl::strings
) )
if (WINDOWS) if (WINDOWS)
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
project(llmessage) project(llmessage)
include(00-Common) include(00-Common)
include(Abseil)
include(CURL) include(CURL)
include(OpenSSL) include(OpenSSL)
include(NGHTTP2) include(NGHTTP2)
...@@ -219,6 +220,9 @@ target_link_libraries( ...@@ -219,6 +220,9 @@ target_link_libraries(
${BOOST_FIBER_LIBRARY} ${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY} ${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
absl::flat_hash_map
absl::node_hash_map
absl::strings
rt rt
) )
else (LINUX) else (LINUX)
...@@ -236,6 +240,9 @@ target_link_libraries( ...@@ -236,6 +240,9 @@ target_link_libraries(
${BOOST_FIBER_LIBRARY} ${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY} ${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
absl::flat_hash_map
absl::node_hash_map
absl::strings
) )
endif(LINUX) endif(LINUX)
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
project(llui) project(llui)
include(00-Common) include(00-Common)
include(Abseil)
include(Hunspell) include(Hunspell)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
...@@ -290,6 +291,9 @@ target_link_libraries(llui ...@@ -290,6 +291,9 @@ target_link_libraries(llui
${HUNSPELL_LIBRARY} ${HUNSPELL_LIBRARY}
${LLMESSAGE_LIBRARIES} ${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender ${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") if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
......
...@@ -7,6 +7,7 @@ include(00-Common) ...@@ -7,6 +7,7 @@ include(00-Common)
# sets variables on which the 3p .cmake files depend. # sets variables on which the 3p .cmake files depend.
include(Linking) include(Linking)
include(Abseil)
include(Boost) include(Boost)
include(bugsplat) include(bugsplat)
include(BuildPackagesInfo) include(BuildPackagesInfo)
...@@ -54,7 +55,6 @@ include(ViewerManager) ...@@ -54,7 +55,6 @@ include(ViewerManager)
include(VisualLeakDetector) include(VisualLeakDetector)
include(ZLIB) include(ZLIB)
include(URIPARSER) include(URIPARSER)
include(Abseil)
if( LLPHYSICSEXTENSIONS_SRC_DIR ) if( LLPHYSICSEXTENSIONS_SRC_DIR )
if (NOT HAVOK_TPV) if (NOT HAVOK_TPV)
...@@ -2153,6 +2153,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ...@@ -2153,6 +2153,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${MINIZIP_LIBRARIES} ${MINIZIP_LIBRARIES}
absl::flat_hash_map absl::flat_hash_map
absl::node_hash_map absl::node_hash_map
absl::strings
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
fmt::fmt fmt::fmt
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment