cmake: Use target_include_directories()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

4 files changed, 21 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d9bb42..61be71a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,8 @@ include(ConfigureChecks.cmake)
 configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 # check subdirectories
-add_subdirectory(src)
 add_subdirectory(include)
+add_subdirectory(src)
 
 if (UNIT_TESTING)
     find_package(CMocka 1.1.0 REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d70f39..45e6a81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,14 @@
 project(libpam_wrapper C)
 
-include_directories(${CMAKE_BINARY_DIR})
-
 ###########################################################
 ### pam_wrapper
 ###########################################################
 
 add_library(pam_wrapper SHARED pam_wrapper.c)
+target_include_directories(pam_wrapper
+                           PRIVATE
+                               ${pam_wrapper-headers_SOURCE_DIR}
+                               ${pam_wrapper_BINARY_DIR})
 
 set(PAM_WRAPPER_LIBRARIES
 	${PAMWRAP_REQUIRED_LIBRARIES}
@@ -45,20 +47,19 @@ set(pamtest_SOURCES
     libpamtest.c
 )
 
-set(pamtest_HEADERS
-    ${CMAKE_SOURCE_DIR}/include/libpamtest.h
-)
-include_directories(${CMAKE_SOURCE_DIR}/include)
-
 set(PAM_LIBRARIES pam)
 if (HAVE_PAM_MISC)
 	list(APPEND PAM_LIBRARIES pam_misc)
 endif (HAVE_PAM_MISC)
 
-add_library(pamtest SHARED
-            ${pamtest_SOURCES}
-            ${pamtest_HEADERS}
-)
+add_library(pamtest SHARED ${pamtest_SOURCES})
+target_include_directories(pamtest
+                           PRIVATE
+                               ${pam_wrapper_BINARY_DIR}
+                           PUBLIC
+                               $<BUILD_INTERFACE:${pam_wrapper-headers_SOURCE_DIR}>
+                               $<INSTALL_INTERFACE:include>)
+
 target_link_libraries(pamtest ${PAM_LIBRARIES})
 target_compile_options(pamtest
                        PRIVATE ${DEFAULT_C_COMPILE_FLAGS})
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 8e13a0b..43ed16d 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -12,6 +12,10 @@ set(PWRAP_PRIVATE_LIBRARIES
 
 foreach(_PAM_MODULE ${PAM_MODULES})
 	add_library(${_PAM_MODULE} MODULE ${_PAM_MODULE}.c)
+    target_include_directories(${_PAM_MODULE}
+                               PRIVATE
+                                   ${pam_wrapper-headers_SOURCE_DIR}
+                                   ${pam_wrapper_BINARY_DIR})
 	set_property(TARGET ${_PAM_MODULE} PROPERTY PREFIX "")
 
 	target_link_libraries(${_PAM_MODULE}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 494e511..60b41c8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,12 +1,5 @@
 project(tests C)
 
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMOCKA_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/include
-)
-
 set(PAM_MATRIX_PATH "${CMAKE_BINARY_DIR}/src/modules/pam_matrix.so")
 
 configure_file(services/matrix.in ${CMAKE_CURRENT_BINARY_DIR}/services/matrix @ONLY)
@@ -78,6 +71,10 @@ add_cmocka_test(test_pam_wrapper
                 SOURCES test_pam_wrapper.c
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TEST_LIBRARIES})
+target_include_directories(test_pam_wrapper
+                           PRIVATE
+                               ${CMOCKA_INCLUDE_DIR}
+                               ${pam_wrapper_BINARY_DIR})
 add_cmocka_test_environment(test_pam_wrapper)
 
 if (PYTHON2_EXECUTABLE)