#2536 Build System AppFwk : Use target_include_directories

2025-02-25 18:55:39 -06:00 · 2018-02-25 15:03:45 +01:00 · 2018-02-25 15:03:45 +01:00 · 65c3d6ff12
commit 65c3d6ff12
parent 1706a6c0c4
11 changed files with 52 additions and 80 deletions
--- a/Fwk/AppFwk/cafCommand/CMakeLists.txt
+++ b/Fwk/AppFwk/cafCommand/CMakeLists.txt
@ -6,16 +6,6 @@ include (${QT_USE_FILE})

 project (cafCommand)

-include_directories(
-    ${cafProjectDataModel_SOURCE_DIR}
-)
-
-include_directories (
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-    .
-)

 # These headers need to go through Qt's MOC compiler
 set( QOBJECT_HEADERS    
@ -71,4 +61,14 @@ add_library( ${PROJECT_NAME}
    ${MOC_FILES_CPP}
 )

+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries ( ${PROJECT_NAME}
+    cafProjectDataModel
+)
+
+
 source_group("" FILES ${PROJECT_FILES})
--- a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
@ -6,12 +6,6 @@ project (cafProjectDataModel)
 find_package ( Qt4 COMPONENTS QtCore QtGui )
 include (${QT_USE_FILE})

-include_directories (
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-)
-
 set( PROJECT_FILES
 	cafFactory.h
 	cafFixedArray.h
@ -28,4 +22,14 @@ add_library( ${PROJECT_NAME}
 	${PROJECT_FILES}
 )

+target_link_libraries ( ${PROJECT_NAME}
+    cafPdmUiCore
+    cafPdmXml
+)
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 source_group("" FILES ${PROJECT_FILES})
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
@ -6,9 +6,6 @@ project (cafPdmCore)
 find_package ( Qt4 COMPONENTS QtCore )
 include (${QT_USE_FILE})

-include_directories (
-)
-
 set( PROJECT_FILES

    cafAssert.h
@ -50,9 +47,13 @@ set( PROJECT_FILES
    cafFilePath.h
 )

-
 add_library( ${PROJECT_NAME}
    ${PROJECT_FILES}
 )

+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 source_group("" FILES ${PROJECT_FILES})
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
@ -6,8 +6,7 @@ include (${QT_USE_FILE})
 project ( cafPdmCore_UnitTests )

 include_directories (
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )


--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
@ -7,8 +7,6 @@ find_package ( Qt4 COMPONENTS QtCore QtGui )
 include (${QT_USE_FILE})

 include_directories (
-	
-    ${cafPdmCore_SOURCE_DIR}
    ..
 )

@ -53,4 +51,13 @@ add_library( ${PROJECT_NAME}
 	${PROJECT_FILES}
 )

+target_link_libraries ( ${PROJECT_NAME}
+    cafPdmCore
+)
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 source_group("" FILES ${PROJECT_FILES})
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
@ -8,7 +8,6 @@ include (${QT_USE_FILE})

 include_directories (
 	..
-    ${cafPdmCore_SOURCE_DIR}
 )

 set( PROJECT_FILES
@ -45,4 +44,13 @@ add_library( ${PROJECT_NAME}
 	${PROJECT_FILES}
 )

+target_link_libraries ( ${PROJECT_NAME}
+    cafPdmCore
+)
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 source_group("" FILES ${PROJECT_FILES})
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
@ -6,12 +6,9 @@ include (${QT_USE_FILE})
 project ( cafPdmXml_UnitTests )

 include_directories (
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/..
-	${cafPdmCore_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )

-
 # add the executable 
 add_executable (${PROJECT_NAME}
 	cafPdmXml_UnitTests.cpp
@ -24,7 +21,6 @@ add_executable (${PROJECT_NAME}
 message(STATUS ${PROJECT_NAME}" - Qt includes : "  ${QT_LIBRARIES})

 target_link_libraries ( ${PROJECT_NAME}
-    cafPdmCore
 	cafPdmXml
    ${QT_LIBRARIES}
    ${THREAD_LIBRARY}
--- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
@ -6,16 +6,7 @@ include (${QT_USE_FILE})
 project ( cafProjectDataModel_UnitTests )

 include_directories (
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/..
-)
-
-include_directories (
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-    
-    ${cafProjectDataModel_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )

 set( PROJECT_FILES
@ -35,9 +26,6 @@ add_executable (${PROJECT_NAME}
 message(${PROJECT_NAME}" - Qt includes : "  ${QT_LIBRARIES})

 target_link_libraries ( ${PROJECT_NAME}
-    cafPdmCore
-    cafPdmUiCore
-    cafPdmXml
 	cafProjectDataModel 
    ${QT_LIBRARIES}
    ${THREAD_LIBRARY}
--- a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
@ -32,11 +32,6 @@ qt4_add_resources( QRC_FILES_CPP
    ${QRC_FILES}
 )

-include_directories (
-    ${cafProjectDataModel_SOURCE_DIR}
-    ${cafUserInterface_SOURCE_DIR}
-)
-
 if (USE_COMMAND_FRAMEWORK)
    include_directories (
        ${cafCommand_SOURCE_DIR}
@ -45,12 +40,6 @@ if (USE_COMMAND_FRAMEWORK)
 endif(USE_COMMAND_FRAMEWORK)


-include_directories (
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-)
-
 set( PROJECT_FILES
    Main.cpp
    MainWindow.cpp
@ -75,7 +64,6 @@ add_executable ( ${PROJECT_NAME}

 set (TAP_LINK_LIBRARIES
    cafUserInterface
-    cafPdmXml
    ${QT_LIBRARIES}
    )

--- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt
+++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt
@ -6,15 +6,6 @@ include (${QT_USE_FILE})

 project (cafUserInterface)

-include_directories(
-    ${cafProjectDataModel_SOURCE_DIR}
-)
-
-include_directories (
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-)

 # These headers need to go through Qt's MOC compiler
 set( QOBJECT_HEADERS    
@ -154,10 +145,13 @@ add_library( ${PROJECT_NAME}
    ${MOC_FILES_CPP}
 )

+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 target_link_libraries ( ${PROJECT_NAME}
    cafProjectDataModel
-    cafPdmUiCore
-    cafPdmCore
    ${QT_LIBRARIES}
 )

--- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
@ -7,15 +7,6 @@ project ( cafUserInterface_UnitTests )

 include_directories (
 	${CMAKE_CURRENT_SOURCE_DIR}   
-	${CMAKE_CURRENT_SOURCE_DIR}/..
-
-    ${cafProjectDataModel_SOURCE_DIR}
-    ${cafPdmCore_SOURCE_DIR}
-    ${cafPdmUiCore_SOURCE_DIR}
-    ${cafPdmXml_SOURCE_DIR}
-    
-    ${cafUserInterface_SOURCE_DIR}
-   
 )


@ -39,10 +30,6 @@ source_group("" FILES ${PROJECT_FILES})
 message(STATUS ${PROJECT_NAME}" - Qt includes : "  ${QT_LIBRARIES})

 target_link_libraries ( ${PROJECT_NAME}
-	cafProjectDataModel
-    cafPdmUiCore
-    cafPdmCore
-    cafPdmXml
    cafUserInterface
    ${QT_LIBRARIES}
    ${THREAD_LIBRARY}