Skip to content

Commit 6819b24

Browse files
authored
Merge pull request #30 from derpda/master
New option: SCALAPACK_BUILD_TESTS
2 parents bc6cad5 + ef46667 commit 6819b24

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

BLACS/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
add_subdirectory(SRC)
2-
if(BUILD_TESTING)
2+
if(${SCALAPACK_BUILD_TESTING})
33
add_subdirectory(TESTING)
4-
endif(BUILD_TESTING)
4+
endif()

CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8)
22
project(SCALAPACK C Fortran)
33
# Configure the warning and code coverage suppression file
4-
configure_file(
4+
configure_file(
55
"${SCALAPACK_SOURCE_DIR}/CMAKE/CTestCustom.cmake.in"
66
"${SCALAPACK_BINARY_DIR}/CTestCustom.cmake"
77
COPYONLY
@@ -48,8 +48,8 @@ if (MPI_FOUND)
4848
PATH_SUFFIXES bin
4949
DOC "MPI Fortran compiler.")
5050
MARK_AS_ADVANCED(MPI_Fortran_COMPILER)
51-
52-
51+
52+
5353

5454
if ("${MPI_Fortran_COMPILER}" STREQUAL "MPI_Fortran_COMPILER-NOTFOUND")
5555
message(ERROR "--> MPI Fortran Compiler NOT FOUND (please set MPI_BASE_DIR accordingly")
@@ -59,7 +59,7 @@ if (MPI_FOUND)
5959
SET(CMAKE_Fortran_COMPILER "${MPI_Fortran_COMPILER}")
6060
message(STATUS "--> Fortran Compiler : ${CMAKE_Fortran_COMPILER}")
6161
endif()
62-
62+
6363
else()
6464
message(STATUS "Found MPI_LIBRARY : ${MPI_FOUND} ")
6565
set(MPI_BASE_DIR ${MPI_BASE_DIR} CACHE PATH "MPI Path")
@@ -184,7 +184,7 @@ OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
184184

185185
# --------------------------------------------------
186186
# Subdirectories that need to be processed
187-
187+
188188
macro(append_subdir_files variable dirname)
189189
get_directory_property(holder DIRECTORY ${dirname} DEFINITION ${variable})
190190
foreach(depfile ${holder})
@@ -243,10 +243,14 @@ else (UNIX) # Need to separate Fortran and C Code
243243
scalapack_install_library(scalapack)
244244
scalapack_install_library(scalapack-F)
245245
endif (UNIX)
246-
add_subdirectory(TESTING)
246+
247+
option(SCALAPACK_BUILD_TESTS "Build all tests of the ScaLAPACK library" ON)
248+
if(${SCALAPACK_BUILD_TESTS})
249+
add_subdirectory(TESTING)
250+
endif()
247251

248252
# --------------------------------------------------
249-
# CPACK Packaging
253+
# CPACK Packaging
250254

251255
SET(CPACK_PACKAGE_NAME "ScaLAPACK")
252256
SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")

PBLAS/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
add_subdirectory(SRC)
2-
add_subdirectory(TESTING)
3-
add_subdirectory(TIMING)
2+
if(${SCALAPACK_BUILD_TESTING})
3+
add_subdirectory(TESTING)
4+
add_subdirectory(TIMING)
5+
endif()

REDIST/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
add_subdirectory(SRC)
2-
add_subdirectory(TESTING)
2+
if(${SCALAPACK_BUILD_TESTING})
3+
add_subdirectory(TESTING)
4+
endif()

0 commit comments

Comments
 (0)