Skip to content
Snippets Groups Projects
Commit 8a12beba authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: ../../CMakeLists.txt

	modified:   Dockerfile
	modified:   ../../src/CMakeLists.txt
parent 4b09c617
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,11 @@ endif()
#set_diagnostic_flags(WALL WEXTRA)
#report_build_info()
#https://github.com/fmtlib/fmt.git
find_package(fmt REQUIRED)
get_target_property(FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
add_definitions(-DSPDLOG_FMT_EXTERNAL )
find_package(spdlog REQUIRED)
if(NOT spdlog_FOUND)
message("spdlog not found.")
......@@ -41,8 +46,6 @@ else()
get_target_property(SPDLOG_INCLUDE_DIR spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
endif()
#https://github.com/fmtlib/fmt.git
find_package(fmt REQUIRED)
#----------------------------------------------------------------------------
# Install in GNU-style directory layout
......
......@@ -21,6 +21,7 @@ RUN ls -lrth /usr/local/lib/lib*.so \
&& cmake ../. && make -j20 && make install && cd /tmp \
&& git clone https://eicweb.phy.anl.gov/jlab/hcana.git \
&& mkdir hcana/build && cd hcana/build \
&& git checkout scandalizer && git pull \
&& cmake ../. && make -j20 && make install \
&& cd /tmp && rm -rf analyzer && rm -rf hcana
......
......@@ -64,6 +64,7 @@ target_include_directories(${LIBNAME}
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> # for hc_compiledata.h
$<BUILD_INTERFACE:${SPDLOG_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${SPDLOG_INCLUDE_DIR}>
$<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
)
target_compile_options(${LIBNAME}
......@@ -104,6 +105,7 @@ install(DIRECTORY include/hcana DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
build_root_dictionary(${LIBNAME} ${headers}
INCLUDEDIRS
$<BUILD_INTERFACE:-I${SPDLOG_INCLUDE_DIR}>
$<BUILD_INTERFACE:-I${FMT_INCLUDE_DIR}>
-I${CMAKE_CURRENT_SOURCE_DIR}
-I${CMAKE_CURRENT_SOURCE_DIR}/include
-I${CMAKE_CURRENT_SOURCE_DIR}/include/hcana
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment