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 boost-Subset

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-27 18:49:24 +01:00
parent 3fbce58fa5
commit 72a3b731bc
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ThirdParty/NRLib/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (NRLib)
@@ -6,8 +6,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/nrlib
${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well
${boost-Subset_SOURCE_DIR}
)
file ( GLOB NRLIB_IOTOOLS_SRC
@@ -32,3 +30,11 @@ endif()
add_subdirectory(well_UnitTests)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well
)
target_link_libraries ( ${PROJECT_NAME}
boost-Subset
)

3
ThirdParty/NRLib/well_UnitTests/CMakeLists.txt vendored
View File

@@ -7,8 +7,6 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../..
${NR_well_SOURCE_DIR}
)
set( PROJECT_FILES
@@ -28,6 +26,5 @@ source_group("" FILES ${PROJECT_FILES})
target_link_libraries ( ${PROJECT_NAME}
NRLib
boost-Subset
)

7
ThirdParty/boost-Subset/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
# Procedure used to extract subset from complete Boost installation
#
@@ -36,3 +36,8 @@ add_library( ${PROJECT_NAME}
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244")
endif()
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

8
ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (custom-opm-flowdiag-app)
@@ -6,7 +6,6 @@ include_directories(
../custom-opm-flowdiagnostics/opm-flowdiagnostics
opm-flowdiagnostics-applications
opmCore
${boost-Subset_SOURCE_DIR}
)
include (opm-flowdiagnostics-applications/CMakeLists_files.cmake)
@@ -26,7 +25,10 @@ add_library(custom-opm-flowdiag-app
${project_source_files_complete_path1}
)
target_link_libraries(custom-opm-flowdiag-app ecl)
target_link_libraries(custom-opm-flowdiag-app
ecl
boost-Subset
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4190 /wd4267")

8
ThirdParty/nightcharts/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (nightcharts)
@@ -14,3 +14,9 @@ add_library( ${PROJECT_NAME}
${MAIN_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
source_group("" FILES ${PROJECT_FILES})