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 : Add target_include_directories to app libraries

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-27 19:05:04 +01:00
parent 4f20273e55
commit 3b63c8d433
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,9 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
project (RigGeoMechDataModel) project (RigGeoMechDataModel)
include_directories( include_directories(
${LibCore_SOURCE_DIR} ${LibCore_SOURCE_DIR}
${cafTensor_SOURCE_DIR}
../../ResultStatisticsCache
../OdbReader
) )
@@ -38,4 +35,11 @@ add_library( ${PROJECT_NAME}
RimGeoMechGeometrySelectionItem.cpp RimGeoMechGeometrySelectionItem.cpp
) )
target_link_libraries( ${PROJECT_NAME} LibCore cafTensor ResultStatisticsCache) target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries( ${PROJECT_NAME} LibCore cafTensor ResultStatisticsCache RifOdbReader)
source_group("" FILES ${PROJECT_FILES})

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

@@ -86,4 +86,11 @@ else()
) )
endif(MSVC) endif(MSVC)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore) target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore)
source_group("" FILES ${PROJECT_FILES})

9
ApplicationCode/ResultStatisticsCache/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
project (ResultStatisticsCache) project (ResultStatisticsCache)
@@ -15,4 +15,11 @@ add_library( ${PROJECT_NAME}
RigStatisticsMath.cpp RigStatisticsMath.cpp
) )
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} LibCore) target_link_libraries(${PROJECT_NAME} LibCore)
source_group("" FILES ${PROJECT_FILES})

12
ApplicationCode/WellPathImportSsihub/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
project (WellPathImportSsihub) project (WellPathImportSsihub)
@@ -11,7 +11,7 @@ set( QOBJECT_HEADERS
set( QT_UI_FILES set( QT_UI_FILES
) )
if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} ) qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} )
endif() endif()
@@ -20,8 +20,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface ${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface
${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafProjectDataModel
${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface
) )
@@ -43,3 +41,9 @@ add_library( ${PROJECT_NAME}
${FORM_FILES_CPP} ${FORM_FILES_CPP}
${HEADER_FILES} ${HEADER_FILES}
) )
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
)
source_group("" FILES ${PROJECT_FILES})