Skip to content

New option: SCALAPACK_BUILD_TESTS #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 26, 2020
Merged

New option: SCALAPACK_BUILD_TESTS #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ebaec
SCALAPACK_BUILD_TESTS option added
derpda Dec 20, 2020
ef46667
Whitespace fixes
derpda Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BLACS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_subdirectory(SRC)
if(BUILD_TESTING)
if(${SCALAPACK_BUILD_TESTING})
add_subdirectory(TESTING)
endif(BUILD_TESTING)
endif()
18 changes: 11 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8)
project(SCALAPACK C Fortran)
# Configure the warning and code coverage suppression file
configure_file(
configure_file(
"${SCALAPACK_SOURCE_DIR}/CMAKE/CTestCustom.cmake.in"
"${SCALAPACK_BINARY_DIR}/CTestCustom.cmake"
COPYONLY
Expand Down Expand Up @@ -48,8 +48,8 @@ if (MPI_FOUND)
PATH_SUFFIXES bin
DOC "MPI Fortran compiler.")
MARK_AS_ADVANCED(MPI_Fortran_COMPILER)



if ("${MPI_Fortran_COMPILER}" STREQUAL "MPI_Fortran_COMPILER-NOTFOUND")
message(ERROR "--> MPI Fortran Compiler NOT FOUND (please set MPI_BASE_DIR accordingly")
Expand All @@ -59,7 +59,7 @@ if (MPI_FOUND)
SET(CMAKE_Fortran_COMPILER "${MPI_Fortran_COMPILER}")
message(STATUS "--> Fortran Compiler : ${CMAKE_Fortran_COMPILER}")
endif()

else()
message(STATUS "Found MPI_LIBRARY : ${MPI_FOUND} ")
set(MPI_BASE_DIR ${MPI_BASE_DIR} CACHE PATH "MPI Path")
Expand Down Expand Up @@ -184,7 +184,7 @@ OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )

# --------------------------------------------------
# Subdirectories that need to be processed

macro(append_subdir_files variable dirname)
get_directory_property(holder DIRECTORY ${dirname} DEFINITION ${variable})
foreach(depfile ${holder})
Expand Down Expand Up @@ -243,10 +243,14 @@ else (UNIX) # Need to separate Fortran and C Code
scalapack_install_library(scalapack)
scalapack_install_library(scalapack-F)
endif (UNIX)
add_subdirectory(TESTING)

option(SCALAPACK_BUILD_TESTS "Build all tests of the ScaLAPACK library" ON)
if(${SCALAPACK_BUILD_TESTS})
add_subdirectory(TESTING)
endif()

# --------------------------------------------------
# CPACK Packaging
# CPACK Packaging

SET(CPACK_PACKAGE_NAME "ScaLAPACK")
SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
Expand Down
6 changes: 4 additions & 2 deletions PBLAS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
add_subdirectory(SRC)
add_subdirectory(TESTING)
add_subdirectory(TIMING)
if(${SCALAPACK_BUILD_TESTING})
add_subdirectory(TESTING)
add_subdirectory(TIMING)
endif()
4 changes: 3 additions & 1 deletion REDIST/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
add_subdirectory(SRC)
add_subdirectory(TESTING)
if(${SCALAPACK_BUILD_TESTING})
add_subdirectory(TESTING)
endif()