fmt, just not for linux

This commit is contained in:
Liru Færs
2019-10-20 05:54:05 -04:00
parent 05146faacf
commit 8a2407ecbb
3 changed files with 9 additions and 2 deletions

View File

@@ -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)

View File

@@ -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 "")

View File

@@ -1671,6 +1671,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLAPPEARANCE_LIBRARIES}
absl::flat_hash_map
absl::node_hash_map
${FMT_LIBRARY}
)
if (LINUX)