Skip to content

Commit b9ec725

Browse files
committed
Only run utest without NOFORTRAN, same as Makefile. Linux now compiles.
1 parent 37858d1 commit b9ec725

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ endforeach ()
117117
# Not using add_subdirectory here because lapack-netlib already has its own CMakeLists.txt. Instead include a cmake script with the sources we want.
118118
if (NOT NOFORTRAN AND NOT NO_LAPACK)
119119
include("${PROJECT_SOURCE_DIR}/cmake/lapack.cmake")
120-
if (NOT NO_LAPACKE)
121-
include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake")
122-
endif ()
120+
if (NOT NO_LAPACKE)
121+
include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake")
122+
endif ()
123123
endif ()
124124

125125
# 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})
169169
endforeach()
170170

171171
enable_testing()
172-
add_subdirectory(utest)
173172

174173
if (USE_THREAD)
175174
# Add threading library to linker
@@ -183,11 +182,14 @@ if (USE_THREAD)
183182
endif()
184183

185184
if (NOT MSVC AND NOT NOFORTRAN)
185+
add_subdirectory(utest)
186186
# Build test and ctest
187187
add_subdirectory(test)
188-
if(NOT NO_CBLAS)
188+
if(NOT NO_CBLAS)
189189
add_subdirectory(ctest)
190190
endif()
191+
elseif(MSVC)
192+
add_subdirectory(utest)
191193
endif()
192194

193195
set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES

0 commit comments

Comments
 (0)