From 2967035cf7eb4c65bfb132dc3609647ccee368f5 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Fri, 27 Apr 2012 10:39:54 +0200
Subject: [PATCH] special conds for windows setup integrated - path for metis
and inclusion of winmm.lib for time measurements
---
SimpleTests/MatrixTests/CMakeLists.txt | 5 +++++
scripts/cmake/Find.cmake | 2 +-
scripts/cmake/FindMetis.cmake | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 0bbb06cdbf2..2ac436a683d 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -1,5 +1,8 @@
## 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)
@@ -37,6 +40,7 @@ IF (METIS_FOUND)
Base
MathLib
${METIS_LIBRARIES}
+ ${ADDITIONAL_LIBS}
)
ADD_EXECUTABLE( MatVecMultNDPermOpenMP
@@ -49,6 +53,7 @@ IF (METIS_FOUND)
Base
MathLib
${METIS_LIBRARIES}
+ ${ADDITIONAL_LIBS}
)
ENDIF(METIS_FOUND)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 69b87d29925..633861e9d20 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -23,5 +23,5 @@ IF(OPENMP_FOUND)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
ENDIF()
-FIND_PACKAGE(Metis)
+FIND_PACKAGE(Metis REQUIRED)
diff --git a/scripts/cmake/FindMetis.cmake b/scripts/cmake/FindMetis.cmake
index a682c147393..0dfe63c5f9e 100644
--- a/scripts/cmake/FindMetis.cmake
+++ b/scripts/cmake/FindMetis.cmake
@@ -13,11 +13,13 @@
FIND_PATH(METIS_INCLUDE_DIR metis.h
/usr/include/metis
$ENV{HOME}/include/
+ ${CMAKE_SOURCE_DIR}/../libs/include
)
FIND_LIBRARY(METIS_LIBRARY metis
/usr/lib
$ENV{HOME}/lib/
+ ${CMAKE_SOURCE_DIR}/../libs/lib
)
IF(METIS_INCLUDE_DIR)
--
GitLab