Merge pull request #22 from OPM/internal

Internal
This commit is contained in:
Magne Sjaastad
2013-04-12 04:06:49 -07:00
471 changed files with 20435 additions and 5692 deletions

View File

@@ -37,6 +37,11 @@ include (ResInsightVersion.cmake)
################################################################################
# ERT
################################################################################
# Disable install of ERT libs and headers, as Ert code is compiled and linked directly
# into ResInsight
SET(INSTALL_ERT OFF CACHE BOOL "Build ERT without installing")
add_subdirectory(ThirdParty/Ert/devel)
include_directories(