Merge pull request #7 from Ivarun/build_fixes

Build fixes
OPM · Sep 1, 2012 · 1ef0229 · 1ef0229
2 parents a5a1dc3 + 94d00b4
commit 1ef0229
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
@@ -234,6 +234,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert/geometry/lib/libgeometry.a
         ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert/well/lib/libwell.a
         lapack
+        z # In case libz is not included in libQtCore
     )
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set ( EXTERNAL_LINK_LIBRARIES

diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
@@ -103,6 +103,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/geometry/lib/libgeometry.a
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/well/lib/libwell.a
         lapack
+        pthread
+        z # In case libz is not included in libQtCore
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set ( EXTERNAL_LINK_LIBRARIES

diff --git a/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt b/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
@@ -52,6 +52,11 @@ add_executable( ${ProjectName}
 )
 
 
-target_link_libraries( ${ProjectName} ${LINK_LIBRARIES})
+set( EXTERNAL_LINK_LIBRARIES
+    pthread
+)
+
+
+target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
 
 
diff --git a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
@@ -60,6 +60,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/util/lib/libutil.a
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/well/lib/libwell.a
         lapack
+        pthread
     )
 
         # Linux specific code

diff --git a/VisualizationModules/LibCore/CMakeLists.txt b/VisualizationModules/LibCore/CMakeLists.txt
@@ -76,3 +76,13 @@ cvfVector4.cpp
 
 add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES})
 
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set ( EXTERNAL_LINK_LIBRARIES
+          rt
+    )
+endif()
+
+
+target_link_libraries(LibCore ${EXTERNAL_LINK_LIBRARIES})
+