diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 0bbb06cdbf24b7005e1e69cc16356d9c55b2ec17..2ac436a683df9cacf07bfe89736c2665d750381a 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 69b87d29925d6268c0a94f4bd2b073fce7123f9e..633861e9d202d2ca4ee6e3391f75b03ff0d1cd96 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 a682c147393e8830d37bd6ceeee0a979655e8ecc..0dfe63c5f9e21eab0b53b084981a75cc020e0386 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)