From 6f3cd529afa4018e29e26058b70ef5efacb650b5 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Wed, 5 Oct 2016 18:31:43 -0700
Subject: Pulled latest updates from trunk

---
 blas/CMakeLists.txt         | 8 ++++----
 blas/testing/CMakeLists.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'blas')

diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt
index d0efb4188..20e2698a7 100644
--- a/blas/CMakeLists.txt
+++ b/blas/CMakeLists.txt
@@ -29,16 +29,16 @@ else()
 endif()
 
 add_library(eigen_blas_static ${EigenBlas_SRCS})
-add_library(eigen_blas SHARED ${EigenBlas_SRCS})
+#add_library(eigen_blas SHARED ${EigenBlas_SRCS})
 
 if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
   target_link_libraries(eigen_blas_static ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
-  target_link_libraries(eigen_blas        ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
+#  target_link_libraries(eigen_blas        ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
 endif()
 
-add_dependencies(blas eigen_blas eigen_blas_static)
+add_dependencies(blas eigen_blas_static)
 
-install(TARGETS eigen_blas eigen_blas_static
+install(TARGETS eigen_blas_static
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib)
diff --git a/blas/testing/CMakeLists.txt b/blas/testing/CMakeLists.txt
index 3ab8026ea..04cc92c67 100644
--- a/blas/testing/CMakeLists.txt
+++ b/blas/testing/CMakeLists.txt
@@ -6,7 +6,7 @@ macro(ei_add_blas_test testname)
   set(filename ${testname}.f)
   add_executable(${targetname} ${filename})
 
-  target_link_libraries(${targetname} eigen_blas)
+  target_link_libraries(${targetname} eigen_blas_static)
 
   if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
     target_link_libraries(${targetname} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
-- 
cgit v1.2.3