[Lib] Update Fmtlib, and enable it for Linux builds. This is bare bones; only removing the Linux workarounds in Cmake.

This commit is contained in:
Router Gray
2020-04-24 07:56:22 -05:00
parent 159de683e8
commit a69e04a817
3 changed files with 5 additions and 7 deletions

View File

@@ -50,12 +50,10 @@ if (LINUX)
set(DL_LIBRARY dl) set(DL_LIBRARY dl)
set(RT_LIBRARY rt) set(RT_LIBRARY rt)
set(PTHREAD_LIBRARY pthread) set(PTHREAD_LIBRARY pthread)
set(FMT_LIBRARY "")
else (LINUX) else (LINUX)
set(DL_LIBRARY "") set(DL_LIBRARY "")
set(RT_LIBRARY "") set(RT_LIBRARY "")
set(PTHREAD_LIBRARY "") set(PTHREAD_LIBRARY "")
set(FMT_LIBRARY fmt::fmt)
endif (LINUX) endif (LINUX)
if (WINDOWS) if (WINDOWS)
@@ -77,6 +75,6 @@ else (WINDOWS)
set(WINDOWS_LIBRARIES "") set(WINDOWS_LIBRARIES "")
endif (WINDOWS) endif (WINDOWS)
mark_as_advanced(DL_LIBRARY RT_LIBRARY PTHREAD_LIBRARY FMT_LIBRARY WINDOWS_LIBRARIES) mark_as_advanced(DL_LIBRARY RT_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

View File

@@ -9,16 +9,18 @@ FetchContent_Declare(
Catch2 Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.11.0 GIT_TAG v2.11.0
GIT_SHALLOW TRUE
) )
FetchContent_Declare( FetchContent_Declare(
fmt fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 6.1.2 GIT_TAG 0463665ef136d685fe07a564d93c782456456d3d
) )
FetchContent_Declare( FetchContent_Declare(
nlohmann_json nlohmann_json
GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG v3.7.3 GIT_TAG v3.7.3
GIT_SHALLOW TRUE
) )
FetchContent_Declare( FetchContent_Declare(
absl absl
@@ -45,9 +47,7 @@ if (BUILD_TESTING)
endif() endif()
#Download the rest of the libraries #Download the rest of the libraries
if(WINDOWS)
FetchContent_MakeAvailable(fmt) FetchContent_MakeAvailable(fmt)
endif()
# Typically you don't care so much for a third party library's tests to be # Typically you don't care so much for a third party library's tests to be
# run from your own project's code. # run from your own project's code.

View File

@@ -1709,7 +1709,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
absl::flat_hash_map absl::flat_hash_map
absl::node_hash_map absl::node_hash_map
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
${FMT_LIBRARY} fmt::fmt
) )
if (LINUX) if (LINUX)