From 8a2407ecbbc9084f7df77b246cef5182f1cf54d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 20 Oct 2019 05:54:05 -0400 Subject: [PATCH] fmt, just not for linux --- indra/cmake/Linking.cmake | 6 +++++- indra/deps/CMakeLists.txt | 4 +++- indra/newview/CMakeLists.txt | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 2a8bf40dd..38ae03a61 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -48,10 +48,14 @@ link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) set(DL_LIBRARY dl) + set(RT_LIBRARY rt) set(PTHREAD_LIBRARY pthread) + set(FMT_LIBRARY "") else (LINUX) set(DL_LIBRARY "") + set(RT_LIBRARY "") set(PTHREAD_LIBRARY "") + set(FMT_LIBRARY fmt::fmt) endif (LINUX) if (WINDOWS) @@ -73,6 +77,6 @@ else (WINDOWS) set(WINDOWS_LIBRARIES "") endif (WINDOWS) -mark_as_advanced(DL_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES) +mark_as_advanced(DL_LIBRARY RT_LIBRARY PTHREAD_LIBRARY FMT_LIBRARY WINDOWS_LIBRARIES) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt index 3525203d6..47b676d2c 100644 --- a/indra/deps/CMakeLists.txt +++ b/indra/deps/CMakeLists.txt @@ -39,6 +39,8 @@ if (BUILD_TESTING) endif() #Download the rest of the libraries -#FetchContent_MakeAvailable(fmt) +if(WINDOWS) +FetchContent_MakeAvailable(fmt) +endif() set(CMAKE_FOLDER "") diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d2f7c5d34..d8b2673b0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1671,6 +1671,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLAPPEARANCE_LIBRARIES} absl::flat_hash_map absl::node_hash_map + ${FMT_LIBRARY} ) if (LINUX)