From ddef268c7ce441dc07bd23dd1edb69aaa901caf2 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Thu, 1 Nov 2018 06:42:32 -0600
Subject: [PATCH 1/2] cmake: fix DBCSR_OPT option

---
 cmake/CMakeLists.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 97aef73..0102af6 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -118,6 +118,12 @@ wrtrestartlib.f90 deorthomyrhoprogress.f90 orthomyHprogress.f90 readrestartlib.f
 readppotspline.f90 pairpotspline.f90 errors.f90 initcoulombklist.f90
 flcnnono.f90 flcnnono_sp.f90 kflcnnono.f90 dosfittab.f90) 
 
+if(NOT DBCSR_OPT)
+  set(DBCSR)
+else()
+  set(DBCSR dbcsr_var_mod.f90 init_dbcsr.f90 shutdown_dbcsr.f90)
+endif()
+
 foreach(_m MYMODULES MYSUBS DBCSR)
   set(${_m}_SOURCES)
   foreach(_file ${${_m}})
@@ -125,11 +131,7 @@ foreach(_m MYMODULES MYSUBS DBCSR)
   endforeach()
 endforeach()
 
-if(NOT DBCSR_OPT)
-  set(DBCSR_SOURCES)
-endif()
-
-add_library(latte ${MYMODULES_SOURCES} ${MYSUBS_SOURCES}
+add_library(latte ${MYMODULES_SOURCES} ${MYSUBS_SOURCES} ${DBCSR_SOURCES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/latte_lib.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/../src/latte_c_bind.f90
 )

From 8422b5cfcc2bde2fca8a363a7d42feb8f77d13cd Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Thu, 1 Nov 2018 06:43:28 -0600
Subject: [PATCH 2/2] cmake: remove DBCSR_OPT as cp2k detection is broken

---
 cmake/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0102af6..506a903 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -52,7 +52,7 @@ if(PROGRESS)
   find_package(PROGRESS REQUIRED)
 endif()  
 
-option(DBCSR_OPT "Whether to use DBCSR" OFF)
+#option(DBCSR_OPT "Whether to use DBCSR" OFF)
 
 option(GPUOPT "Whether to use the GPU" OFF)
 if(GPUOPT)
@@ -118,11 +118,11 @@ wrtrestartlib.f90 deorthomyrhoprogress.f90 orthomyHprogress.f90 readrestartlib.f
 readppotspline.f90 pairpotspline.f90 errors.f90 initcoulombklist.f90
 flcnnono.f90 flcnnono_sp.f90 kflcnnono.f90 dosfittab.f90) 
 
-if(NOT DBCSR_OPT)
-  set(DBCSR)
-else()
-  set(DBCSR dbcsr_var_mod.f90 init_dbcsr.f90 shutdown_dbcsr.f90)
-endif()
+#if(NOT DBCSR_OPT)
+#  set(DBCSR)
+#else()
+#  set(DBCSR dbcsr_var_mod.f90 init_dbcsr.f90 shutdown_dbcsr.f90)
+#endif()
 
 foreach(_m MYMODULES MYSUBS DBCSR)
   set(${_m}_SOURCES)