| @@ -75,10 +75,10 @@ endif () | |||||
| set(SUBDIRS ${BLASDIRS}) | set(SUBDIRS ${BLASDIRS}) | ||||
| if (NOT NO_LAPACK) | if (NOT NO_LAPACK) | ||||
| list(APPEND SUBDIRS lapack) | |||||
| if(BUILD_RELAPACK) | if(BUILD_RELAPACK) | ||||
| list(APPEND SUBDIRS relapack/src) | list(APPEND SUBDIRS relapack/src) | ||||
| endif() | endif() | ||||
| list(APPEND SUBDIRS lapack) | |||||
| endif () | endif () | ||||
| # set which float types we want to build for | # set which float types we want to build for | ||||
| @@ -224,6 +224,14 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES | |||||
| SOVERSION ${OpenBLAS_MAJOR_VERSION} | SOVERSION ${OpenBLAS_MAJOR_VERSION} | ||||
| ) | ) | ||||
| if (BUILD_SHARED_LIBS AND BUILD_RELAPACK) | |||||
| if (NOT MSVC) | |||||
| target_link_libraries(${OpenBLAS_LIBNAME} "-Wl,-allow-multiple-definition") | |||||
| else() | |||||
| target_link_libraries(${OpenBLAS_LIBNAME} "/FORCE:MULTIPLE") | |||||
| endif() | |||||
| endif() | |||||
| if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFIX} STREQUAL "") | if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFIX} STREQUAL "") | ||||
| if (NOT DEFINED ARCH) | if (NOT DEFINED ARCH) | ||||
| set(ARCH_IN "x86_64") | set(ARCH_IN "x86_64") | ||||