Remove extra tests in cudablas

6bcd6425 · Mathieu Faverge · 65fa7203 · 6bcd6425 · 6bcd6425
Commit 6bcd6425 authored Aug 01, 2017 by Mathieu Faverge
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

cudablas/CMakeLists.txt cudablas/CMakeLists.txt +3 -5

cudablas/compute/CMakeLists.txt cudablas/compute/CMakeLists.txt +5 -2

No files found.
--- 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

--- 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