Browse Source

🐞 CMake: Fix fmt dependency

pull/1696/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
commit
890b7f5fe3
  1. 2
      3rdParty/libfmt/CMakeLists.txt
  2. 4
      CMakeLists.txt

2
3rdParty/libfmt/CMakeLists.txt vendored

@ -19,5 +19,3 @@ FetchContent_Declare(fmt
URL_HASH MD5=70e0a0beda4bdac7debe60d380e1d802
)
FetchContent_MakeAvailableExcludeFromAll(fmt)
set(fmt_INCLUDE_DIR ${fmt_SOURCE_DIR} PARENT_SCOPE)

4
CMakeLists.txt

@ -176,7 +176,6 @@ if(NOT NONET)
endif()
if(DEVILUTIONX_SYSTEM_LIBFMT)
set(fmt_USE_STATIC_LIBS ${DEVILUTIONX_STATIC_LIBFMT})
find_package(fmt 7.0.0 QUIET)
if(fmt_FOUND)
message("-- Found fmt ${fmt_VERSION}")
@ -486,7 +485,6 @@ target_include_directories(${BIN_TARGET} PRIVATE
3rdParty/asio/include
3rdParty/Radon/Radon/include
3rdParty/libsmacker
${fmt_INCLUDE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR})
if(NOT N3DS)
@ -504,7 +502,7 @@ if(NOT NONET)
target_link_libraries(${BIN_TARGET} PRIVATE sodium)
endif()
target_link_libraries(${BIN_TARGET} PRIVATE fmt)
target_link_libraries(${BIN_TARGET} PRIVATE fmt::fmt)
genex_for_option(DEBUG)
target_compile_definitions(${BIN_TARGET} PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")

Loading…
Cancel
Save