Commit 74030c74 authored by 's avatar
Browse files

fix test and cmake option

parent ab6eaaf7
......@@ -451,39 +451,37 @@ IF( NEKTAR_USE_MPI )
ENDIF( NEKTAR_USE_MPI )
# Lapack and Blas
IF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${MKL} )
SET_TARGET_PROPERTIES(LibUtilities
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} -DMKL_ILP64")
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
IF( NEKTAR_USE_ACML AND ACML_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${ACML_TARGET_LINK_LIBRARIES} )
ENDIF( NEKTAR_USE_ACML AND ACML_FOUND )
IF( NEKTAR_USE_ACCELERATE_FRAMEWORK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${ACCELERATE_FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_ACCELERATE_FRAMEWORK )
IF( NEKTAR_USE_WIN32_LAPACK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${WIN32_LAPACK} ${WIN32_BLAS})
INSTALL(FILES ${WIN32_LAPACK_DLL} ${WIN32_BLAS_DLL}
DESTINATION ${NEKTAR_BIN_DIR})
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${OPENBLAS})
ENDIF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
IF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${NATIVE_LAPACK} ${NATIVE_BLAS})
ENDIF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
IF(THIRDPARTY_BUILD_BLAS_LAPACK)
ADD_DEPENDENCIES(LibUtilities lapack-3.7.0)
ENDIF()
ENDIF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${MKL} )
SET_TARGET_PROPERTIES(LibUtilities
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} -DMKL_ILP64")
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
IF( NEKTAR_USE_ACML AND ACML_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${ACML_TARGET_LINK_LIBRARIES} )
ENDIF( NEKTAR_USE_ACML AND ACML_FOUND )
IF( NEKTAR_USE_ACCELERATE_FRAMEWORK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${ACCELERATE_FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_ACCELERATE_FRAMEWORK )
IF( NEKTAR_USE_WIN32_LAPACK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${WIN32_LAPACK} ${WIN32_BLAS})
INSTALL(FILES ${WIN32_LAPACK_DLL} ${WIN32_BLAS_DLL}
DESTINATION ${NEKTAR_BIN_DIR})
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${OPENBLAS})
ENDIF( NEKTAR_USE_OPENBLAS AND OPENBLAS_FOUND )
IF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${NATIVE_LAPACK} ${NATIVE_BLAS})
ENDIF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
IF(THIRDPARTY_BUILD_BLAS_LAPACK)
ADD_DEPENDENCIES(LibUtilities lapack-3.7.0)
ENDIF()
IF( NEKTAR_USE_PETSC )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${PETSC_LIBRARIES})
......
......@@ -53,7 +53,9 @@ namespace Nektar
BOOST_AUTO_TEST_CASE(TestDefaultConstructor)
{
SMat m;
double buf[] = {};
boost::shared_ptr<InnerMatrix> in(new InnerMatrix(0, 0, buf));
SMat m(0.0, in);
BOOST_CHECK_EQUAL(0u, m.GetRows());
BOOST_CHECK_EQUAL(0u, m.GetColumns());
BOOST_CHECK(boost::shared_ptr<InnerMatrix>() != m.GetOwnedMatrix());
......
......@@ -22,4 +22,12 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_UTILITY_EXTRAS
"NEKTAR_BUILD_UTILITIES" OFF)
# Generate list of available utilities
SUBDIRS(NekMesh FieldConvert Extras)
IF(NEKTAR_UTILITY_NEKMESH AND NEKTAR_BUILD_UTILITIES)
SUBDIRS(NekMesh)
ENDIF()
IF(NEKTAR_UTILITY_FIELDCONVERT AND NEKTAR_BUILD_UTILITIES)
SUBDIRS(FieldConvert)
ENDIF()
IF(NEKTAR_UTILITY_EXTRAS AND NEKTAR_BUILD_UTILITIES)
SUBDIRS(Extras)
ENDIF()
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment