cmake: Use target_include_directories()

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9059b4bdfb66bf14421b8662212e25f306dcecd..de80cd435a98748533e51c5bc27c9d69ec683b69 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 project(libnss_wrapper C)
 
-include_directories(${CMAKE_BINARY_DIR})
 add_library(nss_wrapper SHARED nss_wrapper.c)
 target_compile_options(nss_wrapper
                        PRIVATE
@@ -10,6 +9,9 @@ if (BSD)
                            PRIVATE
                            -DBSD)
 endif()
+target_include_directories(nss_wrapper
+                           PRIVATE
+                               ${CMAKE_BINARY_DIR})
 target_link_libraries(nss_wrapper ${NWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 set_target_properties(

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 151faf285e7793a17aa3af5180ceba5df0dc9226..1f45b09aa523072849d4f302d8bc8783876ccfe4 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,5 @@
 project(tests C)
 
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMOCKA_INCLUDE_DIR}
-)
-
 set(TESTSUITE_LIBRARIES ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
 
 add_library(nss_nwrap SHARED nss_nwrap.c)
@@ -83,6 +77,10 @@ foreach(_NWRAP_TEST ${NWRAP_TESTS})
                                PRIVATE
                                    -DBSD)
     endif()
+    target_include_directories(${_NWRAP_TEST}
+                               PRIVATE
+                                   ${CMAKE_BINARY_DIR}
+                                   ${CMOCKA_INCLUDE_DIR})
     add_cmocka_test_environment(${_NWRAP_TEST})
 endforeach()
 
@@ -100,6 +98,10 @@ add_cmocka_test(test_nwrap_disabled
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_nwrap_disabled
+                           PRIVATE
+                               ${CMAKE_BINARY_DIR}
+                               ${CMOCKA_INCLUDE_DIR})
 set_property(
     TEST
         test_nwrap_disabled