diff --git a/cudablas/CMakeLists.txt b/cudablas/CMakeLists.txt
index 0a1fb991d088def8d0eb6342779c9f8e20bf18ba..20762027aefc6775723293b6dca0d2e1dcb3166a 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 5ab3c65c497794515305cb1a7157fb585a55c7db..ac5f965b25077ac2efad47c7ec7ae328de80e0c1 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