Merge pull request #61 from norihiro-w/fix-bench-PETSC-GEMS

Fix PETSC_GEMS benchmarks

CMakeLists.txt

@@ -71,6 +71,7 @@ set_property(CACHE OGS_CONFIG PROPERTY STRINGS
 	MKL  # SP + LIS + MKL
 	MPI  # SP(MPI)
 	PETSC # PETSC(MPI)
+	PETSC_GEMS # PETSC(MPI) + GEMS
 )
 
 # default setting for each configuration

scripts/cmake/Find.cmake

@@ -50,7 +50,7 @@ endif()
 ######################
 ### Find libraries ###
 ######################
-if(OGS_LSOLVER STREQUAL PETSC OR OGS_NO_EXTERNAL_LIBS)
+if(OGS_NO_EXTERNAL_LIBS)
 	return()
 endif()
 
@@ -83,21 +83,19 @@ if ( CMAKE_USE_PTHREADS_INIT AND NOT HAVE_PTHREADS)
 	message (STATUS "pthread library found." )
 endif ()
 if(HAVE_PTHREADS)
-  add_definitions(-DHAVE_PTHREADS)
+	add_definitions(-DHAVE_PTHREADS)
 endif()
 mark_as_advanced(CMAKE_THREAD_PREFER_PTHREAD)
 
 ## boost (see FindBoost.cmake for more options) ##
-##kg44 this configuration works for boost and petsc on a cray
-option(Boost_USE_STATIC_LIBS "" ON)
-option(Boost_USE_MULTITHREADED "" ON)
-option(Boost_USE_STATIC_RUNTIME "" ON)
-mark_as_advanced(Boost_USE_STATIC_LIBS Boost_USE_MULTITHREADED Boost_USE_STATIC_RUNTIME)
-
 if(OGS_USE_BOOST)
-	find_package(Boost 1.50.0 COMPONENTS system thread REQUIRED)
-elseif(NOT OGS_DONT_USE_BOOST)
-	find_package( Boost 1.50.0 COMPONENTS filesystem system regex)
+	##kg44 this configuration works for boost and petsc on a cray
+	option(Boost_USE_STATIC_LIBS "" ON)
+	option(Boost_USE_MULTITHREADED "" ON)
+	option(Boost_USE_STATIC_RUNTIME "" ON)
+	mark_as_advanced(Boost_USE_STATIC_LIBS Boost_USE_MULTITHREADED Boost_USE_STATIC_RUNTIME)
+
+	find_package(Boost 1.50.0 COMPONENTS filesystem system thread regex REQUIRED)
 endif()
 
 # Find Math Kernel Library (MKL)
@@ -123,4 +121,4 @@ endif()
 
 if(OGS_USE_LIS)
 	find_package( LIS REQUIRED )
-endif()
+endif()