Merge pull request #26 from ModOrganizer2/dev/stdformat

Remove dependencies to fmt.
This commit is contained in:
Mikaël Capelle
2024-05-25 13:19:42 +02:00
committed by GitHub
2 changed files with 1 additions and 16 deletions
-2
View File
@@ -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)
@@ -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)
+1 -14
View File
@@ -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)
@@ -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)