ERT: Integrated ERT/master from

13c3c25fe1
This commit is contained in:
Magne Sjaastad
2013-10-07 13:31:13 +02:00
parent a7ba7c793c
commit c07875701a
421 changed files with 11699 additions and 12112 deletions

View File

@@ -53,7 +53,7 @@ include (ResInsightVersion.cmake)
# Disable install of ERT libs and headers, as Ert code is compiled and linked directly
SET(INSTALL_ERT OFF CACHE BOOL "ERT: Install library")
SET(USE_OPENMP ${OPENMP_FOUND} CACHE BOOL "ERT: Compile using OpenMP")
SET(ERT_USE_OPENMP ${OPENMP_FOUND} CACHE BOOL "ERT: Compile using OpenMP")
add_subdirectory(ThirdParty/Ert/devel)