Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export include directory when using Easylogging++ as a static library (Fix for #621) #646

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Export include directory when using Easylogging++ as a static library (Fix for #621) #646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9aea4
export include directory to make static library use case more conveni…
MaxSavenkov May 14, 2018
989c340
export directories slightly more properly
MaxSavenkov May 14, 2018
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
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.7)
cmake_minimum_required(VERSION 2.8.11)

project(Easyloggingpp CXX)

Expand Down 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 @@ -53,6 +51,12 @@ if (build_static_lib)

require_cpp11()
add_library(easyloggingpp STATIC src/easylogging++.cc)

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

install(TARGETS
easyloggingpp
Expand Down