diff --git a/CMakeLists.txt b/CMakeLists.txt index 538cc8a0b..a2b81adfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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 + $ + $ + ) + install(TARGETS easyloggingpp ARCHIVE DESTINATION lib) diff --git a/src/easylogging++.h b/src/easylogging++.h index 6e81edfbc..1e90d88b3 100644 --- a/src/easylogging++.h +++ b/src/easylogging++.h @@ -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 MessageBuilder& operator<<(const QPair& pair_) {