Added some more complex-only objects.

diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index 11f2bab..edf25cd 100644 (file)
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -321,7 +321,7 @@ function(GenerateCombinationObjects sources_in defines_in absent_codes_in all_de
         endif ()
       endif ()
 
-      GenerateNamedObjects("${source_file}" "${cur_defines}" "${alternate_name}" 0 "${replace_code}" "${append_code}" "${no_float_type}" "${complex_filename_scheme}")
+      GenerateNamedObjects("${source_file}" "${cur_defines}" "${alternate_name}" false "${replace_code}" "${append_code}" "${no_float_type}" "${complex_filename_scheme}")
       list(APPEND COMBO_OBJ_LIST_OUT "${OBJ_LIST_OUT}")
     endforeach ()
   endforeach ()

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 633b8a6..33464c3 100644 (file)
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -84,6 +84,24 @@ foreach (CBLAS_FLAG ${CBLAS_FLAGS})
 
 endforeach ()
 
+# complex-specific sources
+foreach (float_type ${FLOAT_TYPES})
+  if (${float_type} STREQUAL "COMPLEX" OR ${float_type} STREQUAL "ZCOMPLEX")
+    GenerateNamedObjects("zger.c" "" "geru" false "" "" false ${float_type})
+    GenerateNamedObjects("zger.c" "CONJ" "gerc" false "" "" false ${float_type})
+  endif ()
+  if (${float_type} STREQUAL "COMPLEX")
+    GenerateNamedObjects("zscal.c" "SSCAL" "sscal" false "" "" false "COMPLEX")
+    GenerateNamedObjects("nrm2.c" "" "scnrm2" false "" "" true "COMPLEX")
+  endif ()
+
+  if (${float_type} STREQUAL "ZCOMPLEX")
+    GenerateNamedObjects("zscal.c" "SSCAL" "dscal" false "" "" false "ZCOMPLEX")
+    GenerateNamedObjects("nrm2.c" "" "dznrm2" false "" "" true "ZCOMPLEX")
+  endif ()
+endforeach ()
+
+
 if (NOT DEFINED NO_LAPACK)
   set(LAPACK_SOURCES
     lapack/gesv.c

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index d91b288..84ec428 100644 (file)
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -16,8 +16,6 @@ else ()
 endif ()
 
 SetDefaultL1()
-#-include $(KERNELDIR)/KERNEL.$(TARGET_CORE)
-#include $(KERNELDIR)/KERNEL
 ParseMakefileVars("${KERNELDIR}/KERNEL.${TARGET_CORE}")
 ParseMakefileVars("${KERNELDIR}/KERNEL")
 
@@ -53,12 +51,19 @@ foreach (float_type ${FLOAT_TYPES})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}ASUMKERNEL}" "" "asum_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}AXPYKERNEL}" "" "axpy_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}COPYKERNEL}" "C_INTERFACE" "copy_k" false "" "" false ${float_type})
-  GenerateNamedObjects("${KERNELDIR}/${${float_char}DOTKERNEL}" "" "dot_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}NRM2KERNEL}" "" "nrm2_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}ROTKERNEL}" "" "rot_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}SCALKERNEL}" "" "scal_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}SWAPKERNEL}" "" "swap_k" false "" "" false ${float_type})
   GenerateNamedObjects("${KERNELDIR}/${${float_char}AXPBYKERNEL}" "" "axpby_k" false "" "" false ${float_type})
+
+  if (${float_type} STREQUAL "COMPLEX" OR ${float_type} STREQUAL "ZCOMPLEX")
+    GenerateNamedObjects("${KERNELDIR}/${${float_char}AXPYKERNEL}" "CONJ" "axpyc_k" false "" "" false ${float_type})
+    GenerateNamedObjects("${KERNELDIR}/${${float_char}DOTKERNEL}" "" "dotu_k" false "" "" false ${float_type})
+    GenerateNamedObjects("${KERNELDIR}/${${float_char}DOTKERNEL}" "CONJ" "dotc_k" false "" "" false ${float_type})
+  else ()
+    GenerateNamedObjects("${KERNELDIR}/${${float_char}DOTKERNEL}" "" "dot_k" false "" "" false ${float_type})
+  endif ()
 endforeach ()
 
 # Makefile.L2