From 6bcd642514147caee524a502032f62f0f3962107 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 1 Aug 2017 17:23:33 +0200
Subject: [PATCH] Remove extra tests in cudablas
---
cudablas/CMakeLists.txt | 8 +++-----
cudablas/compute/CMakeLists.txt | 7 +++++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cudablas/CMakeLists.txt b/cudablas/CMakeLists.txt
index 0a1fb991d..20762027a 100644
--- a/cudablas/CMakeLists.txt
+++ b/cudablas/CMakeLists.txt
@@ -26,11 +26,9 @@
#
###
-if (NOT CHAMELEON_SIMULATION)
- add_subdirectory(include)
- add_subdirectory(compute)
- add_subdirectory(eztrace_module)
-endif()
+add_subdirectory(include)
+add_subdirectory(compute)
+add_subdirectory(eztrace_module)
###
### END CMakeLists.txt
diff --git a/cudablas/compute/CMakeLists.txt b/cudablas/compute/CMakeLists.txt
index 5ab3c65c4..ac5f965b2 100644
--- a/cudablas/compute/CMakeLists.txt
+++ b/cudablas/compute/CMakeLists.txt
@@ -94,12 +94,15 @@ add_library(cudablas ${CUDABLAS_SRCS})
add_dependencies(cudablas cudablas_include)
set_property(TARGET cudablas PROPERTY LINKER_LANGUAGE Fortran)
-target_link_libraries(cudablas coreblas ${CUDA_LIBRARIES})
+target_link_libraries(cudablas
+ coreblas
+ ${CUDA_LIBRARIES})
# installation
# ------------
install(TARGETS cudablas
- DESTINATION lib)
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib)
###
### END CMakeLists.txt
--
GitLab