From ca0087eb55746c52c08b354274920a401a0277bb Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 28 Feb 2018 07:42:19 +0100 Subject: [PATCH] #2536 Build System VizFwk : Use target_* and remove includes --- .../GeoMech/GeoMechDataModel/CMakeLists.txt | 4 ---- .../GeoMech/OdbReader/CMakeLists.txt | 1 - CMakeLists.txt | 8 ------- Fwk/AppFwk/CommonCode/CMakeLists.txt | 8 ------- Fwk/AppFwk/cafPdmCvf/CMakeLists.txt | 4 ---- Fwk/AppFwk/cafTensor/CMakeLists.txt | 4 ---- Fwk/AppFwk/cafViewer/CMakeLists.txt | 8 ------- Fwk/AppFwk/cafVizExtensions/CMakeLists.txt | 8 ------- Fwk/VizFwk/LibCore/CMakeLists.txt | 7 ++++++ Fwk/VizFwk/LibGeometry/CMakeLists.txt | 14 +++++++++--- Fwk/VizFwk/LibGuiQt/CMakeLists.txt | 22 +++++++++++++------ Fwk/VizFwk/LibRender/CMakeLists.txt | 14 ++++++++++-- Fwk/VizFwk/LibViewing/CMakeLists.txt | 20 ++++++++++++----- 13 files changed, 59 insertions(+), 63 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt b/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt index c42c903c13..57217c686e 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt +++ b/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 2.8.12) project (RigGeoMechDataModel) -include_directories( - ${LibCore_SOURCE_DIR} -) - add_library( ${PROJECT_NAME} RigFemPart.h diff --git a/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt b/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt index b6c1af5f96..57719f104f 100644 --- a/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt +++ b/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt @@ -36,7 +36,6 @@ endif(MSVC) include_directories( ${RESINSIGHT_ODB_API_DIR}/include - ${LibCore_SOURCE_DIR} ) add_library( ${PROJECT_NAME} diff --git a/CMakeLists.txt b/CMakeLists.txt index fe0a25768a..8a411e5bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,14 +342,6 @@ add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibViewing) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGuiQt) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} -) - list(APPEND VIZ_FWK_LIBRARIES LibGuiQt LibViewing diff --git a/Fwk/AppFwk/CommonCode/CMakeLists.txt b/Fwk/AppFwk/CommonCode/CMakeLists.txt index 4d4b63e8ce..52e5193f4d 100644 --- a/Fwk/AppFwk/CommonCode/CMakeLists.txt +++ b/Fwk/AppFwk/CommonCode/CMakeLists.txt @@ -9,14 +9,6 @@ include (${QT_USE_FILE}) # Open GL find_package( OpenGL ) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} -) - # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS cafMessagePanel.h diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index 59976d98bf..bafd45477d 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -6,10 +6,6 @@ project (cafPdmCvf) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) include (${QT_USE_FILE}) -include_directories( - ${LibCore_SOURCE_DIR} -) - add_library( ${PROJECT_NAME} cafPdmCoreColor3f.h cafPdmUiCoreColor3f.cpp diff --git a/Fwk/AppFwk/cafTensor/CMakeLists.txt b/Fwk/AppFwk/cafTensor/CMakeLists.txt index 309078c889..d15a356c04 100644 --- a/Fwk/AppFwk/cafTensor/CMakeLists.txt +++ b/Fwk/AppFwk/cafTensor/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 2.8.12) project (cafTensor) -include_directories ( - ${LibCore_SOURCE_DIR} -) - set( PROJECT_FILES cafTensor3.cpp cafTensor3.h diff --git a/Fwk/AppFwk/cafViewer/CMakeLists.txt b/Fwk/AppFwk/cafViewer/CMakeLists.txt index 0a4e14227d..2850fc3b0d 100644 --- a/Fwk/AppFwk/cafViewer/CMakeLists.txt +++ b/Fwk/AppFwk/cafViewer/CMakeLists.txt @@ -6,14 +6,6 @@ project (cafViewer) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) include (${QT_USE_FILE}) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} -) - # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS cafViewer.h diff --git a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt index 11a4548332..783194cc35 100644 --- a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt +++ b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt @@ -5,14 +5,6 @@ project (cafVizExtensions) # Open GL find_package( OpenGL ) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} -) - add_library( ${PROJECT_NAME} cafDisplayCoordTransform.cpp cafDisplayCoordTransform.h diff --git a/Fwk/VizFwk/LibCore/CMakeLists.txt b/Fwk/VizFwk/LibCore/CMakeLists.txt index 3ce19f6ec0..0637746261 100644 --- a/Fwk/VizFwk/LibCore/CMakeLists.txt +++ b/Fwk/VizFwk/LibCore/CMakeLists.txt @@ -100,3 +100,10 @@ cvfVector4.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibGeometry/CMakeLists.txt b/Fwk/VizFwk/LibGeometry/CMakeLists.txt index 6034118a2c..c18b0bd727 100644 --- a/Fwk/VizFwk/LibGeometry/CMakeLists.txt +++ b/Fwk/VizFwk/LibGeometry/CMakeLists.txt @@ -7,9 +7,6 @@ project(LibGeometry) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") -include_directories(../LibCore) - - set(CEE_HEADER_FILES cvfArrowGenerator.h cvfBoundingBox.h @@ -57,3 +54,14 @@ cvfVertexWelder.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt index 5184988103..b699af4960 100644 --- a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt +++ b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt @@ -14,13 +14,6 @@ endif() find_package(Qt4 REQUIRED) include(${QT_USE_FILE}) - -include_directories(../LibCore) -include_directories(../LibGeometry) -include_directories(../LibRender) -include_directories(../LibViewing) - - set(CEE_HEADER_FILES cvfqtBasicAboutDialog.h cvfqtCvfBoundQGLContext.h @@ -43,3 +36,18 @@ cvfqtUtils.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibRender + LibViewing + + ${QT_LIBRARIES} +) +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibRender/CMakeLists.txt b/Fwk/VizFwk/LibRender/CMakeLists.txt index d2e28dee6c..73466d5e69 100644 --- a/Fwk/VizFwk/LibRender/CMakeLists.txt +++ b/Fwk/VizFwk/LibRender/CMakeLists.txt @@ -18,8 +18,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() -include_directories(../LibCore) -include_directories(../LibGeometry) include_directories(glew) @@ -178,3 +176,15 @@ cvfViewport.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibViewing/CMakeLists.txt b/Fwk/VizFwk/LibViewing/CMakeLists.txt index 7c40ee0661..28f5937fbd 100644 --- a/Fwk/VizFwk/LibViewing/CMakeLists.txt +++ b/Fwk/VizFwk/LibViewing/CMakeLists.txt @@ -6,12 +6,6 @@ project(LibViewing) # Use our strict compile flags set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") - -include_directories(../LibCore) -include_directories(../LibGeometry) -include_directories(../LibRender) - - set(CEE_HEADER_FILES cvfClipPlaneSet.h cvfConstantFrameRate.h @@ -76,3 +70,17 @@ cvfTransform.cpp ) add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibRender +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES})