From 5719eb3628ef8df7074052be7055bfdfe1935d78 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 3 Jul 2012 12:12:27 +0200
Subject: [PATCH] Moved find statements to Find.cmake.
---
CMakeLists.txt | 6 +++---
SimpleTests/MatrixTests/CMakeLists.txt | 4 +---
SimpleTests/SolverTests/CMakeLists.txt | 14 --------------
scripts/cmake/Find.cmake | 13 +++++++++++++
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c551c3b6b68..4bec8309744 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,8 @@ ADD_SUBDIRECTORY( MeshLib )
ADD_SUBDIRECTORY( OGS )
ADD_SUBDIRECTORY( SimpleTests/MatrixTests )
ADD_SUBDIRECTORY( SimpleTests/MeshTests )
-IF(NOT MSVC)
- ADD_SUBDIRECTORY( SimpleTests/SolverTests )
-ENDIF(NOT MSVC)
+IF(NOT MSVC AND BLAS_FOUND AND LAPACK_FOUND)
+ ADD_SUBDIRECTORY( SimpleTests/SolverTests )
+ENDIF()
CONFIGURE_FILE (BaseLib/BuildInfo.h.in ${PROJECT_BINARY_DIR}/BaseLib/BuildInfo.h)
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 14975e497f5..896517076a3 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -1,12 +1,10 @@
## pthread ##
-SET ( CMAKE_THREAD_PREFER_PTHREAD On )
IF (WIN32)
SET ( ADDITIONAL_LIBS Winmm.lib )
ENDIF()
-FIND_PACKAGE( Threads )
+
IF ( CMAKE_USE_PTHREADS_INIT )
SET (HAVE_PTHREADS TRUE)
- MESSAGE (STATUS "pthread library found." )
ENDIF (CMAKE_USE_PTHREADS_INIT )
INCLUDE_DIRECTORIES(
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index 33ead38b71b..adb599b7843 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/SimpleTests/SolverTests/CMakeLists.txt
@@ -1,17 +1,3 @@
-## pthread ##
-SET ( CMAKE_THREAD_PREFER_PTHREAD On )
-FIND_PACKAGE( Threads )
-
-# Find blas
-FIND_PACKAGE ( BLAS REQUIRED )
-# Find lapack
-FIND_PACKAGE ( LAPACK REQUIRED )
-
-IF ( CMAKE_USE_PTHREADS_INIT )
- SET (HAVE_PTHREADS TRUE)
- MESSAGE (STATUS "pthread library found." )
-ENDIF (CMAKE_USE_PTHREADS_INIT )
-
INCLUDE_DIRECTORIES(
.
../../BaseLib/
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 9140083dd8e..35cc674da52 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -45,3 +45,16 @@ IF ( QT4_FOUND )
INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS(${QT_DEFINITIONS})
ENDIF (QT4_FOUND )
+
+## pthread ##
+SET ( CMAKE_THREAD_PREFER_PTHREAD ON )
+FIND_PACKAGE ( Threads )
+IF ( CMAKE_USE_PTHREADS_INIT )
+ SET (HAVE_PTHREADS TRUE)
+ENDIF (CMAKE_USE_PTHREADS_INIT )
+
+# blas
+FIND_PACKAGE ( BLAS )
+
+# lapack
+FIND_PACKAGE ( LAPACK )
\ No newline at end of file
--
GitLab