Skip to content

Commit 7cb0121

Browse files
committed
added explicit dep on boost for lexical_cast
1 parent 8722795 commit 7cb0121

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ add_subdirectory(doc)
3232
# dependencies to build the InfoLogger components
3333
# NB: cmake/InfoLoggerConfig.cmake defines dependencies for clients using the library
3434
#find_package(Common REQUIRED)
35+
find_package(Boost REQUIRED)
3536
find_package(MySQL)
3637
find_package(SWIG)
3738

3839
# flag to build only client library
40+
#set(INFOLOGGER_BUILD_LIBONLY 1)
3941
if(INFOLOGGER_BUILD_LIBONLY)
4042
message("Enabling libInfologger only.")
4143
else()
@@ -123,7 +125,8 @@ set_target_properties(InfoLogger PROPERTIES
123125
)
124126
target_include_directories(InfoLogger
125127
INTERFACE
126-
${INFOLOGGER_INCLUDE_DIRS_PUBLIC}
128+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INFOLOGGER_INCLUDE_DIRS_PUBLIC}>
129+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
127130
)
128131
target_link_libraries(InfoLogger
129132
PUBLIC
@@ -142,6 +145,8 @@ install(EXPORT InfoLoggerTargets
142145
)
143146
install(FILES cmake/InfoLoggerConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InfoLogger)
144147

148+
# install include files
149+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/InfoLogger DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
145150

146151

147152
##########################################
@@ -366,7 +371,6 @@ foreach (t ${INSTALL_TARGETS})
366371
endif()
367372
endforeach()
368373

369-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/InfoLogger DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
370374
install(PROGRAMS src/infoBrowser.tcl DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME infoBrowser)
371375
install(PROGRAMS newMysql.sh DESTINATION ${CMAKE_INSTALL_BINDIR})
372376

cmake/InfoLoggerConfig.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ get_filename_component(INFOLOGGER_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
33
message(STATUS "InfoLogger found - using cmake targets in ${INFOLOGGER_CMAKE_DIR}")
44

55
# dependencies for clients using the library
6-
# we now package a standalone version of libInfoLogger
7-
# so the lines below are not needed - kept for reference
8-
# include(CMakeFindDependencyMacro)
6+
include(CMakeFindDependencyMacro)
97
# find_dependency(Common REQUIRED)
8+
find_dependency(Boost REQUIRED)
109

1110
# declare InfoLogger target
1211
if(NOT TARGET AliceO2::InfoLogger)

0 commit comments

Comments
 (0)