From 65c3d6ff129e4f5eb89315ff4022b183c36e18d1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 25 Feb 2018 15:03:45 +0100 Subject: [PATCH] #2536 Build System AppFwk : Use target_include_directories --- Fwk/AppFwk/cafCommand/CMakeLists.txt | 20 +++++++++---------- Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt | 16 +++++++++------ .../cafPdmCore/CMakeLists.txt | 9 +++++---- .../cafPdmCore_UnitTests/CMakeLists.txt | 3 +-- .../cafPdmUiCore/CMakeLists.txt | 11 ++++++++-- .../cafPdmXml/CMakeLists.txt | 10 +++++++++- .../cafPdmXml_UnitTests/CMakeLists.txt | 6 +----- .../CMakeLists.txt | 14 +------------ .../cafTestApplication/CMakeLists.txt | 12 ----------- Fwk/AppFwk/cafUserInterface/CMakeLists.txt | 16 +++++---------- .../cafUserInterface_UnitTests/CMakeLists.txt | 15 +------------- 11 files changed, 52 insertions(+), 80 deletions(-) diff --git a/Fwk/AppFwk/cafCommand/CMakeLists.txt b/Fwk/AppFwk/cafCommand/CMakeLists.txt index c0dcef9c9b..7a40f0bbef 100644 --- 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}) \ No newline at end of file diff --git a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt index 7e451984f4..e880ee564d 100644 --- 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}) \ No newline at end of file diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt index 725ff7201f..d703a7c6b6 100644 --- 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}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt index e6a0882885..4868cb2407 100644 --- 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 ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt index 4328e3caa4..45aa9428f7 100644 --- 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}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt index 1ba575d743..a1d93b0af9 100644 --- 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}) \ No newline at end of file diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt index 7a56128283..c00c5b9a44 100644 --- 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} diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt index 4ac2c8cec5..ae22c33511 100644 --- 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} diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt index f03d2a90bd..69de97347c 100644 --- 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} ) diff --git a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt index 29eeeb0a82..05ffb6cbfe 100644 --- 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} ) diff --git a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt index 1644fccae9..d948f19b1c 100644 --- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt @@ -6,16 +6,7 @@ include (${QT_USE_FILE}) 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} - + ${CMAKE_CURRENT_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}