From 0657228569b26c132bbe9a0016912e7cb0fdc2b0 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 21 Dec 2016 14:40:08 -0800 Subject: [PATCH] Simplified the way we link libxsmm --- cmake/EigenTesting.cmake | 6 ------ unsupported/test/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index a83b9435e..a92a2978b 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -84,12 +84,6 @@ macro(ei_add_test_internal testname testname_with_suffix) target_link_libraries(${targetname} ${EIGEN_TEST_CUSTOM_LINKER_FLAGS}) endif() - if(XSMM_FOUND) - include_directories(${XSMM_INCLUDES}) - link_directories(${XSMM_LIBRARIES}) - target_link_libraries(${targetname} xsmm) - endif() - if(${ARGC} GREATER 3) set(libs_to_link ${ARGV3}) # it could be that some cmake module provides a bad library string " " (just spaces), diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index c8511b345..a087f4759 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -25,6 +25,8 @@ find_package(Xsmm) if(XSMM_FOUND) add_definitions("-DEIGEN_USE_LIBXSMM") include_directories(${XSMM_INCLUDES}) + link_directories(${XSMM_LIBRARIES}) + set(EXTERNAL_LIBS ${EXTERNAL_LIBS} xsmm) ei_add_property(EIGEN_TESTED_BACKENDS "Xsmm, ") else(XSMM_FOUND) ei_add_property(EIGEN_MISSING_BACKENDS "Xsmm, ")