Homec4science
Diffusion akantu (bugfixes/google-test-ref-changed) Browse

rAKA/third-party/scalapack_2.0.2.patch
dc4c38ffa3ddbugfixes/google-test…

Last Change
Raw File

scalapack_2.0.2.patch
View Options

diff -Naur scalapack-2.0.2.orig/BLACS/CMakeLists.txt scalapack-2.0.2/BLACS/CMakeLists.txt
--- scalapack-2.0.2.orig/BLACS/CMakeLists.txt 2011-11-08 21:48:31.000000000 +0100
+++ scalapack-2.0.2/BLACS/CMakeLists.txt 2014-07-01 18:29:02.766208418 +0200
@@ -1,4 +1 @@
add_subdirectory(SRC)
-if(BUILD_TESTING)
- add_subdirectory(TESTING)
-endif(BUILD_TESTING)
diff -Naur scalapack-2.0.2.orig/CMakeLists.txt scalapack-2.0.2/CMakeLists.txt
--- scalapack-2.0.2.orig/CMakeLists.txt 2012-05-02 05:58:24.000000000 +0200
+++ scalapack-2.0.2/CMakeLists.txt 2014-07-01 18:29:02.766208418 +0200
@@ -85,22 +85,13 @@
install(TARGETS ${lib} EXPORT scalapack-targets
ARCHIVE DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION lib${LIB_SUFFIX}
- RUNTIME DESTINATION Testing
)
endmacro()
# --------------------------------------------------
-# Testing
-SET(DART_TESTING_TIMEOUT 600)
-
-enable_testing()
-include(CTest)
-enable_testing()
-# --------------------------------------------------
# Organize output files. On Windows this also keeps .dll files next
# to the .exe files that need them, making tests easy to run.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
@@ -243,7 +234,6 @@
scalapack_install_library(scalapack)
scalapack_install_library(scalapack-F)
endif (UNIX)
-add_subdirectory(TESTING)
# --------------------------------------------------
# CPACK Packaging
diff -Naur scalapack-2.0.2.orig/PBLAS/CMakeLists.txt scalapack-2.0.2/PBLAS/CMakeLists.txt
--- scalapack-2.0.2.orig/PBLAS/CMakeLists.txt 2011-11-08 21:48:31.000000000 +0100
+++ scalapack-2.0.2/PBLAS/CMakeLists.txt 2014-07-01 18:29:02.766208418 +0200
@@ -1,3 +1,1 @@
add_subdirectory(SRC)
-add_subdirectory(TESTING)
-add_subdirectory(TIMING)
diff -Naur scalapack-2.0.2.orig/REDIST/CMakeLists.txt scalapack-2.0.2/REDIST/CMakeLists.txt
--- scalapack-2.0.2.orig/REDIST/CMakeLists.txt 2011-11-08 21:48:31.000000000 +0100
+++ scalapack-2.0.2/REDIST/CMakeLists.txt 2014-07-01 18:29:02.770208294 +0200
@@ -1,2 +1,1 @@
add_subdirectory(SRC)
-add_subdirectory(TESTING)
c4science · Help