Browse Source

Merge pull request #1532 from martin-frbg/utest-cblas

Do not try to build the fork utest when NO_CBLAS=1
tags/v0.3.0^2
Martin Kroeker GitHub 8 years ago
parent
commit
86f49c529d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
  1. +2
    -0
      utest/CMakeLists.txt
  2. +2
    -0
      utest/Makefile

+ 2
- 0
utest/CMakeLists.txt View File

@@ -25,6 +25,7 @@ endif ()

# known to hang with the native Windows and Android threads
# FIXME needs checking if this works on any of the other platforms
if (NOT NO_CBLAS)
if (NOT USE_OPENMP)
if (OS_CYGWIN_NT OR OS_LINUX)
set(OpenBLAS_utest_src
@@ -33,6 +34,7 @@ set(OpenBLAS_utest_src
)
endif()
endif()
endif()

if (NOT NO_LAPACK)
set(OpenBLAS_utest_src


+ 2
- 0
utest/Makefile View File

@@ -17,11 +17,13 @@ endif

#this does not work with OpenMP nor with native Windows or Android threads
# FIXME TBD if this works on OSX, SunOS, POWER and zarch
ifneq ($(NO_CBLAS), 1)
ifndef USE_OPENMP
ifeq ($(OSNAME), $(filter $(OSNAME),Linux CYGWIN_NT))
OBJS += test_fork.o
endif
endif
endif

all : run_test



Loading…
Cancel
Save