special conds for windows setup integrated - path for metis and inclusion of...

special conds for windows setup integrated - path for metis and inclusion of winmm.lib for time measurements

SimpleTests/MatrixTests/CMakeLists.txt

 ## 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)
 

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)
 

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)