cmake: Use target_include_directories()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@samba.org>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59f7ed6a2d480d33f9af6bf4b9249d1f302bd774..5f63602f1a40a67be629be8e0a442096eea5f047 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,14 @@
 project(libuid_wrapper C)
 
-include_directories(${CMAKE_BINARY_DIR})
 add_library(uid_wrapper SHARED uid_wrapper.c)
 
 target_compile_options(uid_wrapper
                        PRIVATE
                            ${DEFAULT_C_COMPILE_FLAGS})
 
+target_include_directories(uid_wrapper
+                           PRIVATE ${CMAKE_BINARY_DIR})
+
 target_link_libraries(uid_wrapper ${UIDWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 set_target_properties(

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cfce3ee67c67f4a4a528d8add7072957ae7cba4c..ad566747cd55f1e7e7c7a677dc1e6240236638e0 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(PRELOAD_LIBS ${UID_WRAPPER_LOCATION})
 
 function(ADD_CMOCKA_TEST_ENVIRONMENT _TEST_NAME)
@@ -55,6 +49,8 @@ if (BSD)
 endif (BSD)
 
 add_executable(mock_exec_uid mock_exec_uid.c)
+target_include_directories(mock_exec_uid
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 
 set(UWRAP_UID_TESTS
      test_setuid
@@ -119,6 +115,8 @@ foreach(_UWRAP_TEST ${UWRAP_TESTS})
                     LINK_LIBRARIES ${TESTSUITE_LIBRARIES}
                     LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
 
+    target_include_directories(${_UWRAP_TEST}
+                               PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
     add_cmocka_test_environment(${_UWRAP_TEST} UID_WRAPPER_ROOT=1)
 endforeach()
 
@@ -133,6 +131,8 @@ add_cmocka_test(test_uwrap_enabled
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES} uwrap_enabled
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_uwrap_enabled
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 add_cmocka_test_environment(test_uwrap_enabled)
 
 add_cmocka_test(test_uwrap_disabled
@@ -140,6 +140,8 @@ add_cmocka_test(test_uwrap_disabled
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_uwrap_disabled
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 set_property(
     TEST
         test_uwrap_disabled
@@ -151,6 +153,8 @@ add_cmocka_test(test_thread_setuid
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_thread_setuid
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 add_cmocka_test_environment(test_thread_setuid UID_WRAPPER_ROOT=1 CMOCKA_TEST_ABORT=1)
 
 add_cmocka_test(test_thread_setreuid
@@ -158,6 +162,8 @@ add_cmocka_test(test_thread_setreuid
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_thread_setreuid
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 add_cmocka_test_environment(test_thread_setreuid UID_WRAPPER_ROOT=1 CMOCKA_TEST_ABORT=1)
 
 add_cmocka_test(test_thread_sync_setreuid
@@ -165,6 +171,8 @@ add_cmocka_test(test_thread_sync_setreuid
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_thread_sync_setreuid
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 add_cmocka_test_environment(test_thread_sync_setreuid UID_WRAPPER_ROOT=1 CMOCKA_TEST_ABORT=1)
 
 add_cmocka_test(test_glibc_thread_support
@@ -172,6 +180,8 @@ add_cmocka_test(test_glibc_thread_support
                 COMPILE_OPTIONS ${DEFAULT_C_COMPILE_FLAGS}
                 LINK_LIBRARIES ${TESTSUITE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
                 LINK_OPTIONS ${DEFAULT_LINK_FLAGS})
+target_include_directories(test_glibc_thread_support
+                           PRIVATE ${CMAKE_BINARY_DIR} ${CMOCKA_INCLUDE_DIR})
 add_cmocka_test_environment(test_glibc_thread_support UID_WRAPPER_ROOT=1 CMOCKA_TEST_ABORT=1)
 
 if (LINUX)