From 1c044da54ad69420654b37f44a143d44d0b20d7b Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sun, 5 Jun 2016 18:45:53 +0200
Subject: [PATCH] Always use static libraries for opm libs and NRlib

---
 ThirdParty/NRLib/CMakeLists.txt             |  1 +
 ThirdParty/custom-opm-common/CMakeLists.txt | 24 ++++++++++-----------
 ThirdParty/custom-opm-parser/CMakeLists.txt |  3 +--
 ThirdParty/custom-opmjson/CMakeLists.txt    |  7 +++---
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ThirdParty/NRLib/CMakeLists.txt b/ThirdParty/NRLib/CMakeLists.txt
index e72e8b2ebe..72b08e6a23 100644
--- a/ThirdParty/NRLib/CMakeLists.txt
+++ b/ThirdParty/NRLib/CMakeLists.txt
@@ -28,6 +28,7 @@ file ( GLOB NRLIB_WELL_SRC
 )
 
 add_library( ${PROJECT_NAME}
+       STATIC
        ${NRLIB_IOTOOLS_SRC}
        ${NRLIB_WELL_SRC}
 )
diff --git a/ThirdParty/custom-opm-common/CMakeLists.txt b/ThirdParty/custom-opm-common/CMakeLists.txt
index c204d1aa9c..07b38d7889 100644
--- a/ThirdParty/custom-opm-common/CMakeLists.txt
+++ b/ThirdParty/custom-opm-common/CMakeLists.txt
@@ -3,25 +3,25 @@ cmake_minimum_required (VERSION 2.8)
 project (custom-opm-common)
 
 include_directories(
-       ${CMAKE_CURRENT_SOURCE_DIR}/opm-common
+    ${CMAKE_CURRENT_SOURCE_DIR}/opm-common
 )
 
 #include(opm-common/CMakeLists_files.cmake)
 
 list (APPEND MAIN_SOURCE_FILES
-      opm-common/opm/common/data/SimulationDataContainer.cpp
-      opm-common/opm/common/OpmLog/CounterLog.cpp
-      opm-common/opm/common/OpmLog/EclipsePRTLog.cpp
-      opm-common/opm/common/OpmLog/LogBackend.cpp
-      opm-common/opm/common/OpmLog/Logger.cpp
-      opm-common/opm/common/OpmLog/LogUtil.cpp
-      opm-common/opm/common/OpmLog/OpmLog.cpp
-      opm-common/opm/common/OpmLog/StreamLog.cpp
-      opm-common/opm/common/OpmLog/TimerLog.cpp
+    opm-common/opm/common/data/SimulationDataContainer.cpp
+    opm-common/opm/common/OpmLog/CounterLog.cpp
+    opm-common/opm/common/OpmLog/EclipsePRTLog.cpp
+    opm-common/opm/common/OpmLog/LogBackend.cpp
+    opm-common/opm/common/OpmLog/Logger.cpp
+    opm-common/opm/common/OpmLog/LogUtil.cpp
+    opm-common/opm/common/OpmLog/OpmLog.cpp
+    opm-common/opm/common/OpmLog/StreamLog.cpp
+    opm-common/opm/common/OpmLog/TimerLog.cpp
 )
 
-
 add_library( ${PROJECT_NAME}
-       ${MAIN_SOURCE_FILES}
+    STATIC
+    ${MAIN_SOURCE_FILES}
 )
 
diff --git a/ThirdParty/custom-opm-parser/CMakeLists.txt b/ThirdParty/custom-opm-parser/CMakeLists.txt
index 330433bb55..8b280b2db1 100644
--- a/ThirdParty/custom-opm-parser/CMakeLists.txt
+++ b/ThirdParty/custom-opm-parser/CMakeLists.txt
@@ -321,9 +321,8 @@ generated-source/ParserKeywords3.cpp
 )
 
 add_library(${PROJECT_NAME} 
-
+    STATIC
     ${incl_path} 
-    
     ${opm_parser_generated_source_files} 
 )
 
diff --git a/ThirdParty/custom-opmjson/CMakeLists.txt b/ThirdParty/custom-opmjson/CMakeLists.txt
index bad1be1622..e79669801b 100644
--- a/ThirdParty/custom-opmjson/CMakeLists.txt
+++ b/ThirdParty/custom-opmjson/CMakeLists.txt
@@ -8,11 +8,12 @@ include_directories(
 )
 
 list (APPEND MAIN_SOURCE_FILES
-      opm/json/JsonObject.cpp
-      opm/json/cjson/cJSON.c
+    opm/json/JsonObject.cpp
+    opm/json/cjson/cJSON.c
 )
 
 add_library( ${PROJECT_NAME}
-       ${MAIN_SOURCE_FILES}
+    STATIC
+    ${MAIN_SOURCE_FILES}
 )