Skip to content

Commit d95e876

Browse files
authored
Shared library MKL linking support (#114)
Minor accompaniments to non-avx and MKL linking support PR in private repo plus removal of duplicated FindSphinx.cmake
1 parent c39a2ab commit d95e876

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

cmake/FindSphinx.cmake

Lines changed: 0 additions & 29 deletions
This file was deleted.

cmake/mkl.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ find_package(MKL CONFIG REQUIRED)
2424
#
2525
# The resulting object and linking are portable and should be suitable for distribution.
2626
if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
27-
set(SVS_MKL_CUSTOM_LIBRARY_NAME libmkl_custom)
27+
set(SVS_MKL_CUSTOM_LIBRARY_NAME libsvs_mkl)
2828
set(SVS_MKL_CUSTOM_SO_NAME ${SVS_MKL_CUSTOM_LIBRARY_NAME}.so)
2929
set(SVS_MKL_CUSTOM_FULL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${SVS_MKL_CUSTOM_SO_NAME})
3030

@@ -82,7 +82,7 @@ if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
8282
# Ensure that the custom Intel(R) MKL library is bundled with the rest of the library.
8383
include(GNUInstallDirs)
8484
install(IMPORTED_RUNTIME_ARTIFACTS svs_mkl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
85-
else()
85+
elseif(NOT SVS_EXPERIMENTAL_LINK_STATIC_MKL)
8686
target_compile_options(
8787
${SVS_LIB} INTERFACE $<TARGET_PROPERTY:MKL::MKL,INTERFACE_COMPILE_OPTIONS>
8888
)

0 commit comments

Comments
 (0)