Skip to content
This repository was archived by the owner on Jul 6, 2025. It is now read-only.

Add include directory to el-target #750

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add include directory to el-target #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb6a24
Add include directory to el-target
aaigner Apr 15, 2020
a206e34
Merge remote-tracking branch 'upstream/develop' into develop
aaigner Jan 20, 2021
620beef
Remove deprecated qt5 class
aaigner Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ set(ELPP_VERSION_STRING "${ELPP_MAJOR_VERSION}.${ELPP_MINOR_VERSION}.${ELPP_PATC
set(ELPP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

install(FILES
src/easylogging++.h
src/easylogging++.cc
Expand All @@ -61,6 +59,12 @@ if (build_static_lib)
add_library(easyloggingpp STATIC src/easylogging++.cc)
set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)

target_include_directories(easyloggingpp
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:lib>
)

install(TARGETS
easyloggingpp
ARCHIVE DESTINATION lib)
Expand Down
1 change: 0 additions & 1 deletion src/easylogging++.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3029,7 +3029,6 @@ return writeIterator(template_inst.begin(), template_inst.end(), template_inst.s
ELPP_ITERATOR_CONTAINER_LOG_ONE_ARG(QVector)
ELPP_ITERATOR_CONTAINER_LOG_ONE_ARG(QQueue)
ELPP_ITERATOR_CONTAINER_LOG_ONE_ARG(QSet)
ELPP_ITERATOR_CONTAINER_LOG_ONE_ARG(QLinkedList)
ELPP_ITERATOR_CONTAINER_LOG_ONE_ARG(QStack)
template <typename First, typename Second>
MessageBuilder& operator<<(const QPair<First, Second>& pair_) {
Expand Down