Remove use fmtlib package from build system

This commit is contained in:
Joakim Hove 2020-09-18 11:19:41 +02:00
parent f9d43e738a
commit 3004e14e9a
3 changed files with 3 additions and 11 deletions

View File

@ -73,17 +73,9 @@ macro (config_hook)
if(NOT cjson_FOUND)
list(APPEND EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/external/cjson)
endif()
if(TARGET fmt::fmt)
get_target_property(fmt_INCLUDES fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
elseif(TARGET fmt)
get_target_property(fmt_INCLUDES fmt INTERFACE_INCLUDE_DIRECTORIES)
else()
message(FATAL_ERROR "Cannot identify fmt target to use")
endif()
add_definitions(-DFMT_HEADER_ONLY)
# For this project
include_directories(${EXTRA_INCLUDES} ${PROJECT_BINARY_DIR}/include ${fmt_INCLUDES})
include_directories(${EXTRA_INCLUDES} ${PROJECT_BINARY_DIR}/include)
# For downstreams
list(APPEND EXTRA_INCLUDES ${PROJECT_BINARY_DIR}/include)

2
debian/control vendored
View File

@ -7,7 +7,7 @@ Build-Depends: build-essential, debhelper (>= 9),
ghostscript, libboost-system-dev, libboost-test-dev,
zlib1g-dev, libpython3-dev, python3-numpy, python3-distutils,
python3-setuptools, python3-setuptools-scm, python3-pytest-runner,
python3-decorator, libfmt-dev
python3-decorator
Standards-Version: 3.9.2
Section: libs
Homepage: http://opm-project.org

View File

@ -12,7 +12,7 @@ License: GPL-3.0
Group: Development/Libraries/C and C++
Url: http://www.opm-project.org/
Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: git doxygen bc openmpi-devel mpich-devel fmt-devel
BuildRequires: git doxygen bc openmpi-devel mpich-devel
%{?!el8:BuildRequires: devtoolset-8-toolchain}
%{?el8:BuildRequires: boost-devel}
%{?!el8:BuildRequires: boost148-devel}