diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-05 18:31:43 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-05 18:31:43 -0700 |
| commit | 6f3cd529afa4018e29e26058b70ef5efacb650b5 (patch) | |
| tree | 8c4c45cc570f841bf37aaf7ab2f34d7da7ea28dd /blas | |
| parent | f899e08946fa6ea262ae358f41b5ff9a94003c04 (diff) | |
Pulled latest updates from trunk
Diffstat (limited to 'blas')
| -rw-r--r-- | blas/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | blas/testing/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 5 deletions
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}) |