Replace include_directories with target_include_directories

And use PUBLIC to ensure it propagates correctly

CMakeLists.txt

@@ -104,9 +104,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
 
 add_definitions(-DWITH_MODEMMANAGER_SUPPORT=${WITH_MODEMMANAGER_SUPPORT})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs
-                    ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/)
-
 add_subdirectory(applet)
 add_subdirectory(kded)
 add_subdirectory(kcm)

kcm/CMakeLists.txt

-include_directories(${CMAKE_SOURCE_DIR}/libs/editor
-                    ${CMAKE_SOURCE_DIR}/libs/editor/widgets)
-
 #KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement-kcm\")
 

kded/CMakeLists.txt

 add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement-kded\")
 
-include_directories(${CMAKE_SOURCE_DIR}/libs/editor/widgets)
-
 if (WITH_MODEMMANAGER_SUPPORT)
     set(kded_networkmanagement_SRCS
         ../libs/debug.cpp

libs/CMakeLists.txt

@@ -18,6 +18,8 @@ set(plasmanm_internal_SRCS
 
 add_library(plasmanm_internal SHARED ${plasmanm_internal_SRCS})
 
+target_include_directories(plasmanm_internal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/models)
+
 target_link_libraries(plasmanm_internal
 PUBLIC
     KF5::NetworkManagerQt

libs/declarative/CMakeLists.txt

-include_directories(${CMAKE_SOURCE_DIR}/libs/models)
-
 set(plasmanm_qml_plugins_SRCS
    availabledevices.cpp
    connectionicon.cpp

libs/editor/CMakeLists.txt

-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/widgets)
-
 set(plasmanm_editor_SRCS
     settings/bondwidget.cpp
     settings/bridgewidget.cpp
@@ -91,6 +89,14 @@ ki18n_wrap_ui(plasmanm_editor_SRCS
 )
 
 add_library(plasmanm_editor SHARED ${plasmanm_editor_SRCS})
+
+target_include_directories(plasmanm_editor
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/libs
+)
+
 target_link_libraries(plasmanm_editor
 PUBLIC
     KF5::ConfigWidgets

tests/CMakeLists.txt

-include_directories( ${CMAKE_SOURCE_DIR}/libs/editor )
-
-########### next target ###############
-
 include(ECMAddTests)
 
 find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test)

vpn/CMakeLists.txt

-include_directories(${CMAKE_SOURCE_DIR}/libs/editor/widgets)
-
 add_subdirectory(fortisslvpn)
 add_subdirectory(iodine)
 add_subdirectory(l2tp)