floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only run utest without NOFORTRAN, same as Makefile. Linux now compiles.

This commit is contained in:
Sacha Refshauge 2017-08-20 00:13:24 +10:00
parent 37858d1146
commit b9ec72546c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -117,9 +117,9 @@ endforeach ()
# Not using add_subdirectory here because lapack-netlib already has its own CMakeLists.txt. Instead include a cmake script with the sources we want. # Not using add_subdirectory here because lapack-netlib already has its own CMakeLists.txt. Instead include a cmake script with the sources we want.
if (NOT NOFORTRAN AND NOT NO_LAPACK) if (NOT NOFORTRAN AND NOT NO_LAPACK)
include("${PROJECT_SOURCE_DIR}/cmake/lapack.cmake") include("${PROJECT_SOURCE_DIR}/cmake/lapack.cmake")
if (NOT NO_LAPACKE) if (NOT NO_LAPACKE)
include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake") include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake")
endif () endif ()
endif () endif ()
# Only generate .def for dll on MSVC and always produce pdb files for debug and release # Only generate .def for dll on MSVC and always produce pdb files for debug and release
@ -169,7 +169,6 @@ foreach (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
endforeach() endforeach()
enable_testing() enable_testing()
add_subdirectory(utest)
if (USE_THREAD) if (USE_THREAD)
# Add threading library to linker # Add threading library to linker
@ -183,11 +182,14 @@ if (USE_THREAD)
endif() endif()
if (NOT MSVC AND NOT NOFORTRAN) if (NOT MSVC AND NOT NOFORTRAN)
add_subdirectory(utest)
# Build test and ctest # Build test and ctest
add_subdirectory(test) add_subdirectory(test)
if(NOT NO_CBLAS) if(NOT NO_CBLAS)
add_subdirectory(ctest) add_subdirectory(ctest)
endif() endif()
elseif(MSVC)
add_subdirectory(utest)
endif() endif()
set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES