Use target_include_directory

* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.

Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt

@@ -20,8 +20,6 @@ find_package(
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
-include_directories(..)
-
 add_definitions(-DCVF_USING_CMAKE)
 
 set(PROJECT_FILES
@@ -86,7 +84,9 @@ set(QRC_FILES
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
 
-target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
+target_link_libraries(
+  ${PROJECT_NAME} cafPdmCore cafProjectDataModel ${QT_LIBRARIES}
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt

@@ -14,8 +14,6 @@ find_package(
 )
 set(QT_LIBRARIES Qt5::Core Qt5::Xml)
 
-include_directories(..)
-
 set(PROJECT_FILES
     cafInternalPdmFieldIoHelper.cpp
     cafInternalPdmFieldIoHelper.h

Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt

@@ -19,18 +19,7 @@ qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
 
 option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
 
-include_directories(
-  ${LibCore_SOURCE_DIR}
-  ${LibGeometry_SOURCE_DIR}
-  ${LibGuiQt_SOURCE_DIR}
-  ${LibRender_SOURCE_DIR}
-  ${LibViewing_SOURCE_DIR}
-  ${cafProjectDataModel_SOURCE_DIR}
-  ${cafUserInterface_SOURCE_DIR}
-)
-
 if(USE_COMMAND_FRAMEWORK)
-  include_directories(${cafCommand_SOURCE_DIR})
   add_definitions(-DTAP_USE_COMMAND_FRAMEWORK)
 endif(USE_COMMAND_FRAMEWORK)
 

Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt

@@ -9,7 +9,8 @@ find_package(
 )
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL Qt5::Svg)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
+)
 
 set(PROJECT_FILES cafUserInterface_UnitTests.cpp cafPdmUiTreeViewModelTest.cpp
                   cafPdmUiTreeSelectionQModelTest.cpp gtest/gtest-all.cpp