Prefer target_include_directories()

It is more specific, and it properly sets up propagation when include
directories also need to be used further down a dependency chain.

4 files changed, 14 insertions, 17 deletions

diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
index b4cfb3c4..f08eaa31 100644
--- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/common)
-
 add_library(network STATIC
   Socket.cxx
   TcpSocket.cxx)
@@ -8,6 +6,7 @@ if(NOT WIN32)
   target_sources(network PRIVATE UnixSocket.cxx)
 endif()
 
+target_include_directories(network PUBLIC ${CMAKE_SOURCE_DIR}/common)
 target_link_libraries(network os rdr rfb)
 
 if(WIN32)
diff --git a/common/os/CMakeLists.txt b/common/os/CMakeLists.txt
index deaf2f96..2573d088 100644
--- a/common/os/CMakeLists.txt
+++ b/common/os/CMakeLists.txt
@@ -1,10 +1,9 @@
-include_directories(${CMAKE_SOURCE_DIR}/common)
-
 add_library(os STATIC
   Mutex.cxx
   Thread.cxx
   os.cxx)
 
+target_include_directories(os PUBLIC ${CMAKE_SOURCE_DIR}/common)
 target_link_libraries(os rdr)
 
 if(UNIX)
diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index 05d8c195..30c2403a 100644
--- a/common/rdr/CMakeLists.txt
+++ b/common/rdr/CMakeLists.txt
@@ -1,6 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/common)
-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
-
 add_library(rdr STATIC
   AESInStream.cxx
   AESOutStream.cxx
@@ -19,14 +16,16 @@ add_library(rdr STATIC
   ZlibInStream.cxx
   ZlibOutStream.cxx)
 
+target_include_directories(rdr PUBLIC ${CMAKE_SOURCE_DIR}/common)
+target_include_directories(rdr SYSTEM PUBLIC ${ZLIB_INCLUDE_DIRS})
 target_link_libraries(rdr ${ZLIB_LIBRARIES} os rfb)
 
 if(GNUTLS_FOUND)
-  include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR})
+  target_include_directories(rdr SYSTEM PUBLIC ${GNUTLS_INCLUDE_DIR})
   target_link_libraries(rdr ${GNUTLS_LIBRARIES})
 endif()
 if (NETTLE_FOUND)
-  include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS})
+  target_include_directories(rdr SYSTEM PUBLIC ${NETTLE_INCLUDE_DIRS})
   target_link_libraries(rdr ${NETTLE_LIBRARIES})
   target_link_directories(rdr PUBLIC ${NETTLE_LIBRARY_DIRS})
 endif()
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index f8fbf45a..25c777a0 100644
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -1,7 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/common)
-include_directories(SYSTEM ${JPEG_INCLUDE_DIR})
-include_directories(SYSTEM ${PIXMAN_INCLUDE_DIRS})
-
 add_library(rfb STATIC
   Blacklist.cxx
   Congestion.cxx
@@ -66,6 +62,9 @@ add_library(rfb STATIC
   obfuscate.cxx
   util.cxx)
 
+target_include_directories(rfb PUBLIC ${CMAKE_SOURCE_DIR}/common)
+target_include_directories(rfb SYSTEM PUBLIC ${JPEG_INCLUDE_DIR})
+target_include_directories(rfb SYSTEM PUBLIC ${PIXMAN_INCLUDE_DIRS})
 target_link_libraries(rfb os rdr network)
 target_link_libraries(rfb ${JPEG_LIBRARIES} ${PIXMAN_LIBRARIES})
 target_link_directories(rfb PUBLIC ${PIXMAN_LIBRARY_DIRS})
@@ -77,7 +76,7 @@ if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE")
   elseif(H264_LIBS STREQUAL "WIN")
     target_sources(rfb PRIVATE H264WinDecoderContext.cxx)
   endif()
-  include_directories(SYSTEM ${H264_INCLUDE_DIRS})
+  target_include_directories(rfb SYSTEM PUBLIC ${H264_INCLUDE_DIRS})
   target_link_libraries(rfb ${H264_LIBRARIES})
   target_link_directories(rfb PUBLIC ${H264_LIBRARY_DIRS})
 endif()
@@ -87,7 +86,7 @@ if(UNIX)
 endif()
 
 if(WIN32)
-  include_directories(${CMAKE_SOURCE_DIR}/win)
+  target_include_directories(rfb PUBLIC ${CMAKE_SOURCE_DIR}/win)
   target_sources(rfb PRIVATE WinPasswdValidator.cxx)
 endif(WIN32)
 
@@ -98,14 +97,15 @@ endif()
 
 if(GNUTLS_FOUND)
   target_sources(rfb PRIVATE CSecurityTLS.cxx SSecurityTLS.cxx)
-  include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR})
+  target_include_directories(rfb SYSTEM PUBLIC ${GNUTLS_INCLUDE_DIR})
   target_link_libraries(rfb ${GNUTLS_LIBRARIES})
 endif()
 
 if (NETTLE_FOUND)
   target_sources(rfb PRIVATE CSecurityDH.cxx CSecurityMSLogonII.cxx
                  CSecurityRSAAES.cxx SSecurityRSAAES.cxx)
-  include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS} ${GMP_INCLUDE_DIRS})
+  target_include_directories(rfb SYSTEM PUBLIC ${NETTLE_INCLUDE_DIRS}
+                             ${GMP_INCLUDE_DIRS})
   target_link_libraries(rfb ${HOGWEED_LIBRARIES}
                         ${NETTLE_LIBRARIES} ${GMP_LIBRARIES})
   target_link_directories(rfb PUBLIC ${HOGWEED_LIBRARY_DIRS}