[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [prison] /: Replace the include_directories line
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2016-08-14 8:24:07
Message-ID: E1bYqiF-0001OW-Jr () code ! kde ! org
[Download RAW message or body]

Git commit f109d4814709044b2588df8a2f751af290e0f529 by Christophe Giboudeau=
x.
Committed on 14/08/2016 at 08:22.
Pushed by cgiboudeaux into branch 'master'.

Replace the include_directories line

M  +0    -2    CMakeLists.txt
M  +1    -0    lib/CMakeLists.txt

http://commits.kde.org/prison/f109d4814709044b2588df8a2f751af290e0f529

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13a36e7..3b5183e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,6 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX PRISON
                         SOVERSION 5
 )
 =

-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR=
})
-
 add_subdirectory(lib)
 add_subdirectory(tools)
 if(BUILD_TESTING)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 642bb6e..f4a287d 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -16,6 +16,7 @@ generate_export_header(KF5Prison BASE_NAME Prison)
 add_library(KF5::Prison ALIAS KF5Prison)
 =

 target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_=
INSTALL_INCLUDEDIR_KF5}/prison/>")
+target_include_directories(KF5Prison PUBLIC "$<BUILD_INTERFACE:${prison_SO=
URCE_DIR}>")
 =

 target_link_libraries(KF5Prison
 PUBLIC
[prev in list] [next in list] [prev in thread] [next in thread]