Added cblas_ objects to interface CMakeLists.

Naming isn't right, though, not seeing cblas_xxxx exports in the
resulting library.

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 79b3b3c..6ef498c 100644 (file)
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -1,19 +1,34 @@
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-if (NOT DEFINED NO_CBLAS)
-  # TODO: Need to generate object files for S, D, C, Q and X - start with D for now.
-  #       The sources are the same, but there are additional preprocessor definitions depending on the precision (see Makefile.tail).
-
-  add_library(DBLAS1OBJS OBJECT
-    axpy.c swap.c
-    copy.c scal.c
-    dot.c
-    asum.c nrm2.c
-    max.c # amax/min/amin compiled later from same source
-    rot.c rotg.c rotm.c rotmg.c
-    axpby.c
-  )
+set(BLAS1_SOURCES
+  axpy.c swap.c
+  copy.c scal.c
+  dot.c
+  asum.c nrm2.c
+  rot.c rotg.c rotm.c rotmg.c
+  axpby.c
+)
+
+# TODO: USE_NETLIB_GEMV shoudl switch gemv.c to netlib/*gemv.f
+set(BLAS2_SOURCES
+  gemv.c ger.c
+  trsv.c trmv.c symv.c
+  syr.c syr2.c gbmv.c
+  sbmv.c spmv.c
+  spr.c spr2.c
+  tbsv.c tbmv.c
+  tpsv.c tpmv.c
+)
+
+set(BLAS3_SOURCES
+  gemm.c symm.c
+  trsm.c syrk.c syr2k.c
+  omatcopy.c imatcopy.c
+)
+
+
+if (NOT DEFINED NO_FBLAS)
 
   # N.B. The original Makefile passed in -UUSE_MIN and -UUSE_ABS (where appropriate), no way to do that at a source-level in cmake. REMOVE_DEFINITIONS removes a definition for the rest of the compilation.
   add_library(AMAX_OBJ OBJECT max.c)
@@ -22,29 +37,37 @@ if (NOT DEFINED NO_CBLAS)
   set_target_properties(AMIN_OBJ PROPERTIES COMPILE_DEFINITIONS "USE_ABS;USE_MIN")
   add_library(MIN_OBJ OBJECT max.c)
   set_target_properties(MIN_OBJ PROPERTIES COMPILE_DEFINITIONS "USE_MIN")
+  add_library(MAX_OBJ OBJECT max.c)
 
-  # TODO: USE_NETLIB_GEMV shoudl switch gemv.c to netlib/*gemv.f
-  add_library(DBLAS2OBJS OBJECT
-    gemv.c ger.c
-    trsv.c trmv.c symv.c
-    syr.c  syr2.c gbmv.c
-    sbmv.c spmv.c
-    spr.c  spr2.c
-    tbsv.c tbmv.c
-    tpsv.c tpmv.c
-  )
-
-  add_library(DBLAS3OBJS OBJECT
-    gemm.c symm.c
-    trsm.c syrk.c syr2k.c
-    omatcopy.c imatcopy.c
-  )
+  add_library(DBLAS1OBJS OBJECT ${BLAS1_SOURCES})
+  add_library(DBLAS2OBJS OBJECT ${BLAS2_SOURCES})
+  add_library(DBLAS3OBJS OBJECT ${BLAS3_SOURCES})
 
   # trmm is trsm with a compiler flag set
   add_library(TRMM_OBJ OBJECT trsm.c)
   set_target_properties(TRMM_OBJ PROPERTIES COMPILE_DEFINITIONS "TRMM")
 
-  list(APPEND DBLAS_OBJS "DBLAS1OBJS;DBLAS2OBJS;DBLAS3OBJS;AMAX_OBJ;AMIN_OBJ;MIN_OBJ;TRMM_OBJ")
+  list(APPEND DBLAS_OBJS "DBLAS1OBJS;DBLAS2OBJS;DBLAS3OBJS;AMAX_OBJ;AMIN_OBJ;MIN_OBJ;MAX_OBJ;TRMM_OBJ")
+endif ()
+
+if (NOT DEFINED NO_CBLAS)
+
+  add_library(ISAMAX_OBJ OBJECT imax.c)
+  set_target_properties(ISAMAX_OBJ PROPERTIES COMPILE_DEFINITIONS "CBLAS;USE_ABS")
+
+  add_library(CDBLAS1_OBJS OBJECT ${BLAS1_SOURCES})
+  add_library(CDBLAS2_OBJS OBJECT ${BLAS2_SOURCES})
+  add_library(CDBLAS3_OBJS OBJECT ${BLAS3_SOURCES})
+
+  # trmm is trsm with a compiler flag set
+  add_library(CTRMM_OBJ OBJECT trsm.c)
+  set_target_properties(CTRMM_OBJ PROPERTIES COMPILE_DEFINITIONS "CBLAS;TRMM")
+
+  set_target_properties(CDBLAS1_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
+  set_target_properties(CDBLAS2_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
+  set_target_properties(CDBLAS3_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
+
+  list(APPEND DBLAS_OBJS "CDBLAS1_OBJS;CDBLAS2_OBJS;CDBLAS3_OBJS;ISAMAX_OBJ;CTRMM_OBJ")
 endif ()
 
 if (NOT DEFINED NO_LAPACK)