Add an option LAPACKE_WITH_TMG that will generate the LAPACKE with the TMG routines...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5aee4457e9902714d42aee3cd5f8bc2e855ebe28..773243273bbe00dc863290ef038a2a6e07072a6f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,9 +147,15 @@ endif(BUILD_TESTING)
 # --------------------------------------------------
 # LAPACKE
 option(LAPACKE "Build LAPACKE" OFF)
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+if (LAPACKE_WITH_TMG)
+  option(LAPACKE "Build LAPACKE" ON)
+endif(LAPACKE_WITH_TMG)
+
 if(LAPACKE)
   add_subdirectory(lapacke)
-  
 endif(LAPACKE)
 
 # --------------------------------------------------

diff --git a/INSTALL/make.inc.ALPHA b/INSTALL/make.inc.ALPHA
index d2d09cbb58ad719ddcb5633dd6ba2b4d68ebd6a1..adad07fd38f4f082c4dc1e10cca71883d1d7a99a 100644 (file)
--- a/INSTALL/make.inc.ALPHA
+++ b/INSTALL/make.inc.ALPHA
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O4
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.HPPA b/INSTALL/make.inc.HPPA
index e908e7b167f789e827334b86f153070fd396f91b..8de94211ca11e35f950fe3aefa688057f058d7ee 100644 (file)
--- a/INSTALL/make.inc.HPPA
+++ b/INSTALL/make.inc.HPPA
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS =
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.IRIX64 b/INSTALL/make.inc.IRIX64
index c62eb32f5f3c0748031ea5649443faae75ff5f4c..b0665e028833db76c3d3c5397792948f2e7d8beb 100644 (file)
--- a/INSTALL/make.inc.IRIX64
+++ b/INSTALL/make.inc.IRIX64
@@ -48,6 +48,9 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
 #
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.

diff --git a/INSTALL/make.inc.O2K b/INSTALL/make.inc.O2K
index 7004ab1134018d6e525445f851f49f8838ef5fc4..9da7f009898ee9c0846117d89ba43d2fe6cb0702 100644 (file)
--- a/INSTALL/make.inc.O2K
+++ b/INSTALL/make.inc.O2K
@@ -48,6 +48,9 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
 #
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.

diff --git a/INSTALL/make.inc.RS6K b/INSTALL/make.inc.RS6K
index 9325deec2911919359142061899b709af14a7e30..b788a4fbb2b04052c7e75c1bfa39c8d81d4dbcf1 100644 (file)
--- a/INSTALL/make.inc.RS6K
+++ b/INSTALL/make.inc.RS6K
@@ -45,6 +45,9 @@ TIMER    = EXT_ETIME_
 CC = xlc
 CFLAGS = -O3 -qmaxmem=-1
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
 #
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.

diff --git a/INSTALL/make.inc.SGI5 b/INSTALL/make.inc.SGI5
index 5af642950324924ce57adc95319259f54e991f83..0472ae42c463ad97d3fb9256010253e7a042a075 100644 (file)
--- a/INSTALL/make.inc.SGI5
+++ b/INSTALL/make.inc.SGI5
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O4
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.SUN4 b/INSTALL/make.inc.SUN4
index 3f7effd3c6c31e0b0629869e0e218186f927baa7..f2f352c94fcb79e7a2940a07e555f5b0af03ab3c 100644 (file)
--- a/INSTALL/make.inc.SUN4
+++ b/INSTALL/make.inc.SUN4
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.SUN4SOL2 b/INSTALL/make.inc.SUN4SOL2
index ee5c1a2da2bd244c51e21d9a004fb3aeb4705ed0..ff31e959ae3fca63803c1017f3d3bfe640f467da 100644 (file)
--- a/INSTALL/make.inc.SUN4SOL2
+++ b/INSTALL/make.inc.SUN4SOL2
@@ -49,6 +49,10 @@ TIMER    = EXT_ETIME
 CC = cc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.gfortran b/INSTALL/make.inc.gfortran
index f9c99285d1208d5698b8a3b176fd993ba3b63221..1a83c54f41e628c9e50bb7d9ad24cad0d623b5ad 100644 (file)
--- a/INSTALL/make.inc.gfortran
+++ b/INSTALL/make.inc.gfortran
@@ -45,6 +45,10 @@ TIMER    = INT_ETIME
 CC = gcc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.gfortran_debug b/INSTALL/make.inc.gfortran_debug
index 474e335f951efeacaf05fc1a4effe634a8192a80..46182cdb05247406ecf8e0dfe54fc9f5115332ec 100644 (file)
--- a/INSTALL/make.inc.gfortran_debug
+++ b/INSTALL/make.inc.gfortran_debug
@@ -45,6 +45,10 @@ TIMER    = INT_CPU_TIME
 CC = gcc
 CFLAGS = -g
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.ifort b/INSTALL/make.inc.ifort
index cde53b9c27832d35b5dfd4b87c2cb7396d2a76dc..3b9119759a1f7048e1ce2459f4f2c24363d3b21d 100644 (file)
--- a/INSTALL/make.inc.ifort
+++ b/INSTALL/make.inc.ifort
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = icc
 CFLAGS = -O3
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/INSTALL/make.inc.pghpf b/INSTALL/make.inc.pghpf
index 886401d8fef83ecbca7978ebd8f4f188000ab708..082d3a6046ba62df34eb990a5744f6a048f6b43f 100644 (file)
--- a/INSTALL/make.inc.pghpf
+++ b/INSTALL/make.inc.pghpf
@@ -45,6 +45,10 @@ TIMER    = EXT_ETIME
 CC = pghpc
 CFLAGS =
 #
+# LAPACKE has also the interface to some routines from tmglib,
+# if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+#LAPACKE_WITH_TMG = Yes
+#
 #  The archiver and the flag(s) to use when building archive (library)
 #  If you system has no ranlib, set RANLIB = echo.
 #

diff --git a/lapacke/CMakeLists.txt b/lapacke/CMakeLists.txt
index 750b58248edb19131ff86f7d635c50a66700bf89..8ce87d148a91c51e252dc4967db63231fa19401c 100644 (file)
--- a/lapacke/CMakeLists.txt
+++ b/lapacke/CMakeLists.txt
@@ -37,11 +37,16 @@ append_subdir_files(MATGEN_OBJ "src")
 append_subdir_files(UTILS_OBJ "utils")
 
 if (USE_XBLAS)
-   add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
-   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
+   add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
 else (USE_XBLAS)
+  if (LAPACKE_WITH_TMG)
    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
    target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
+  else (LAPACKE_WITH_TMG)
+   add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
+  endif(LAPACKE_WITH_TMG)
 endif(USE_XBLAS)
 
 lapack_install_library(lapacke)