From 2bbd48588e01db0f8d6bfdb32671a96d4d83ebe3 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Mon, 10 Sep 2012 11:34:11 +0200
Subject: [PATCH] Fixes for Visual Studio

---
 ApplicationCode/CMakeLists.txt                 | 18 +++++++++++++-----
 .../FileInterface_UnitTests/CMakeLists.txt     | 18 +++++++++++++-----
 .../CMakeLists.txt                             |  9 +++++----
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index f919585de7..16e7d0de9a 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -72,11 +72,19 @@ set( ERT_INCLUDE_LIST
      ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/include )
 
 # Link to these ERT libraries
-set( ERT_LIBRARY_LIST 
-     ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a 
-     ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a 
-     ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a 
-     ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set( ERT_LIBRARY_LIST 
+         ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a 
+         ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a 
+         ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a 
+         ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set( ERT_LIBRARY_LIST 
+         ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.lib
+         ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.lib
+         ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.lib
+         ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.lib )
+endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    list(APPEND ERT_LIBRARY_LIST lapack z)  
diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
index 9694384740..37d6a2333c 100644
--- a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
@@ -41,11 +41,19 @@ set( ERT_INCLUDE_LIST
      ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/include )
 
 # Link to these ERT libraries
-set( ERT_LIBRARY_LIST 
-     ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a 
-     ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a 
-     ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a 
-     ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set( ERT_LIBRARY_LIST 
+         ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a 
+         ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a 
+         ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a 
+         ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set( ERT_LIBRARY_LIST 
+         ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.lib
+         ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.lib
+         ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.lib
+         ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.lib )
+endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    list(APPEND ERT_LIBRARY_LIST lapack z)  
diff --git a/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt b/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
index fa35ac9b5a..0b0bb00ce8 100644
--- a/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
@@ -52,10 +52,11 @@ add_executable( ${ProjectName}
 )
 
 
-set( EXTERNAL_LINK_LIBRARIES
-    pthread
-)
-
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set( EXTERNAL_LINK_LIBRARIES
+        pthread
+    )
+ENDIF()
 
 target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})