OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2536 Build System VizFwk : Use target_* and remove includes

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-28 07:42:19 +01:00
parent 233df05f68
commit ca0087eb55
13 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (RigGeoMechDataModel) project (RigGeoMechDataModel)
include_directories(
${LibCore_SOURCE_DIR}
)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
RigFemPart.h RigFemPart.h

1
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@ -36,7 +36,6 @@ endif(MSVC)
include_directories( include_directories(
${RESINSIGHT_ODB_API_DIR}/include ${RESINSIGHT_ODB_API_DIR}/include
${LibCore_SOURCE_DIR}
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}

8
CMakeLists.txt
View File

@ -342,14 +342,6 @@ add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibViewing) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibViewing)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGuiQt) 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 list(APPEND VIZ_FWK_LIBRARIES
LibGuiQt LibGuiQt
LibViewing LibViewing

8
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@ -9,14 +9,6 @@ include (${QT_USE_FILE})
# Open GL # Open GL
find_package( OpenGL ) 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 # These headers need to go through Qt's MOC compiler
set( QOBJECT_HEADERS set( QOBJECT_HEADERS
cafMessagePanel.h cafMessagePanel.h

4
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@ -6,10 +6,6 @@ project (cafPdmCvf)
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain )
include (${QT_USE_FILE}) include (${QT_USE_FILE})
include_directories(
${LibCore_SOURCE_DIR}
)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
cafPdmCoreColor3f.h cafPdmCoreColor3f.h
cafPdmUiCoreColor3f.cpp cafPdmUiCoreColor3f.cpp

4
Fwk/AppFwk/cafTensor/CMakeLists.txt
View File

@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafTensor) project (cafTensor)
include_directories (
${LibCore_SOURCE_DIR}
)
set( PROJECT_FILES set( PROJECT_FILES
cafTensor3.cpp cafTensor3.cpp
cafTensor3.h cafTensor3.h

8
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@ -6,14 +6,6 @@ project (cafViewer)
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain )
include (${QT_USE_FILE}) 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 # These headers need to go through Qt's MOC compiler
set( QOBJECT_HEADERS set( QOBJECT_HEADERS
cafViewer.h cafViewer.h

8
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@ -5,14 +5,6 @@ project (cafVizExtensions)
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )
include_directories(
${LibCore_SOURCE_DIR}
${LibGeometry_SOURCE_DIR}
${LibGuiQt_SOURCE_DIR}
${LibRender_SOURCE_DIR}
${LibViewing_SOURCE_DIR}
)
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
cafDisplayCoordTransform.cpp cafDisplayCoordTransform.cpp
cafDisplayCoordTransform.h cafDisplayCoordTransform.h

7
Fwk/VizFwk/LibCore/CMakeLists.txt
View File

@ -100,3 +100,10 @@ cvfVector4.cpp
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) 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})

14
Fwk/VizFwk/LibGeometry/CMakeLists.txt
View File

@ -7,9 +7,6 @@ project(LibGeometry)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}")
include_directories(../LibCore)
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfArrowGenerator.h cvfArrowGenerator.h
cvfBoundingBox.h cvfBoundingBox.h
@ -57,3 +54,14 @@ cvfVertexWelder.cpp
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) 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})

22
Fwk/VizFwk/LibGuiQt/CMakeLists.txt
View File

@ -14,13 +14,6 @@ endif()
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
include_directories(../LibCore)
include_directories(../LibGeometry)
include_directories(../LibRender)
include_directories(../LibViewing)
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfqtBasicAboutDialog.h cvfqtBasicAboutDialog.h
cvfqtCvfBoundQGLContext.h cvfqtCvfBoundQGLContext.h
@ -43,3 +36,18 @@ cvfqtUtils.cpp
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) 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})

14
Fwk/VizFwk/LibRender/CMakeLists.txt
View File

@ -18,8 +18,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif() endif()
include_directories(../LibCore)
include_directories(../LibGeometry)
include_directories(glew) include_directories(glew)
@ -178,3 +176,15 @@ cvfViewport.cpp
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) 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})

20
Fwk/VizFwk/LibViewing/CMakeLists.txt
View File

@ -6,12 +6,6 @@ project(LibViewing)
# Use our strict compile flags # Use our strict compile flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_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 set(CEE_HEADER_FILES
cvfClipPlaneSet.h cvfClipPlaneSet.h
cvfConstantFrameRate.h cvfConstantFrameRate.h
@ -76,3 +70,17 @@ cvfTransform.cpp
) )
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) 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})