From d71476b1aa3ce0a5227449dd3b692fe481c7909c Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sat, 21 Jan 2017 12:26:21 +0100
Subject: [PATCH] System : Improved organization of ThirdParty libraries

---
 ApplicationCode/CMakeLists.txt |  8 ++------
 CMakeLists.txt                 | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 17dcf17d52..1cddba839e 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -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} )
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bf1ff5e2f..158efc45c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
 ################################################################################