Skip to content

Commit

Permalink
Remove dependencies to fmt.
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 committed May 25, 2024
1 parent 8474454 commit 0640ca1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 0 additions & 2 deletions mo2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/mo2_utils.cmake)
# setup path for find_package(), etc.
mo2_required_variable(NAME BOOST_ROOT TYPE PATH)
mo2_required_variable(NAME QT_ROOT TYPE PATH)
mo2_required_variable(NAME FMT_ROOT TYPE PATH)
mo2_required_variable(NAME PYTHON_ROOT TYPE PATH)
mo2_required_variable(NAME CMAKE_INSTALL_PREFIX TYPE PATH)

Expand All @@ -21,7 +20,6 @@ get_filename_component(MO2_INSTALL_LIBS_PATH "${MO2_INSTALL_PATH}/libs" REALPATH

list(APPEND CMAKE_PREFIX_PATH
${QT_ROOT}/lib/cmake
${FMT_ROOT}/build
${BOOST_ROOT}/build
${MO2_BUILD_PATH}/googletest/build/lib/cmake/GTest)

Expand Down
15 changes: 1 addition & 14 deletions mo2_targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function(mo2_find_uibase)
set_target_properties(mo2-uibase PROPERTIES
IMPORTED_IMPLIB ${MO2_INSTALL_LIBS_PATH}/uibase.lib)
mo2_add_dependencies(mo2-uibase
INTERFACE fmt Qt::Widgets Qt::Network Qt::QuickWidgets)
INTERFACE Qt::Widgets Qt::Network Qt::QuickWidgets)
target_include_directories(mo2-uibase
INTERFACE ${MO2_UIBASE_INCLUDE} ${MO2_UIBASE_INCLUDE}/game_features)
add_library(mo2::uibase ALIAS mo2-uibase)
Expand Down Expand Up @@ -354,19 +354,6 @@ function(mo2_find_7z)

endfunction()

#! mo2_find_fmt : find and carete a mo2::fmt target
#
function(mo2_find_fmt)
if (TARGET mo2-fmt)
return()
endif()

find_package(fmt REQUIRED)
add_library(mo2-fmt ALIAS fmt::fmt)
add_library(mo2::fmt ALIAS fmt::fmt)

endfunction()

#! mo2_find_tomlplusplus : find and create a mo2::tomlplusplus target
#
function(mo2_find_tomlplusplus)
Expand Down

0 comments on commit 0640ca1

Please sign in to comment.