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

System : Improved organization of ThirdParty libraries

Browse Source
This commit is contained in:
Magne Sjaastad 2017-01-21 12:26:21 +01:00
parent 825c505443
commit d71476b1aa
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CMakeLists.txt
View File

@ -289,9 +289,7 @@ endif()
set( LINK_LIBRARIES
custom-opm-parser
custom-opm-flowdiagnostics
custom-opm-flowdiag-app
${OPM_LIBRARIES}
WellPathImportSsihub
@ -303,14 +301,12 @@ set( LINK_LIBRARIES
${ERT_LIBRARIES}
NRLib
${THIRD_PARTY_LIBRARIES}
${OPENGL_LIBRARIES}
${QT_LIBRARIES}
${RI_BOOST_LIBRARIES}
Qwt
)
set( EXTERNAL_LINK_LIBRARIES ${ERT_LIBRARY_LIST} )

32
CMakeLists.txt
View File

@ -185,13 +185,14 @@ else()
ecl_well
ert_geometry
ert_util
ert_utilxx
)
if (MSVC)
set_property(TARGET
${ERT_LIBRARIES}
ecl_lfs
PROPERTY FOLDER "ERT"
PROPERTY FOLDER "Thirdparty/ERT"
)
endif()
@ -210,12 +211,32 @@ add_subdirectory(ThirdParty/custom-opm-parser/custom-opm-parser-tests)
add_subdirectory(ThirdParty/custom-opm-flowdiagnostics)
add_subdirectory(ThirdParty/custom-opm-flowdiag-app)
list(APPEND OPM_LIBRARIES
custom-opm-parser
custom-opm-flowdiagnostics
custom-opm-flowdiag-app
)
set_property(TARGET
${OPM_LIBRARIES}
PROPERTY FOLDER "Thirdparty/OPM"
)
set_property(TARGET
opm-parser-tests
PROPERTY FOLDER "Thirdparty/OPM"
)
################################################################################
# NRLib
################################################################################
add_subdirectory(ThirdParty/NRLib)
list(APPEND THIRD_PARTY_LIBRARIES
NRLib
)
################################################################################
# Qt
@ -241,6 +262,15 @@ find_package( OpenGL )
add_subdirectory(ThirdParty/Qwt/src)
list(APPEND THIRD_PARTY_LIBRARIES
Qwt
)
set_property(TARGET
${THIRD_PARTY_LIBRARIES}
PROPERTY FOLDER "Thirdparty"
)
################################################################################
# Vizualization Framework
################################################################################