From 25d9adc8fcb7d6a2a4d5af326d446c7dd63d45bb Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Mon, 14 May 2018 17:36:00 +0200
Subject: [PATCH] cmake: some more work towards full BMWlibs support.

---
 src/external/BMWtools/CMakeLists.txt        | 2 +-
 src/external/CMakeLists.txt                 | 2 --
 src/external/libCuba/src/CMakeLists.txt     | 2 +-
 src/external/libZFRelaxation/CMakeLists.txt | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt
index 11219fe8..4326ee62 100644
--- a/src/external/BMWtools/CMakeLists.txt
+++ b/src/external/BMWtools/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(BMWtools ${ROOT_LIBRARIES}) # //as35 cuba lib needs to be added here!!
+target_link_libraries(BMWtools ${ROOT_LIBRARIES} cuba)
 
 #--- install BMWtools solib ---------------------------------------------------
 install(TARGETS BMWtools DESTINATION lib)
diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
index b01b1df8..2b510ec4 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -10,9 +10,7 @@ if (BMWlibs)
   add_subdirectory(BMWtools)
   add_subdirectory(libCalcMeanFieldsLEM)
   add_subdirectory(libFitPofB)
-#[==[
   add_subdirectory(libGapIntegrals)
-#]==]
   add_subdirectory(libLFRelaxation)
   add_subdirectory(libZFRelaxation)
 endif (BMWlibs)
diff --git a/src/external/libCuba/src/CMakeLists.txt b/src/external/libCuba/src/CMakeLists.txt
index 63201c5c..5253fda5 100644
--- a/src/external/libCuba/src/CMakeLists.txt
+++ b/src/external/libCuba/src/CMakeLists.txt
@@ -5,7 +5,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\$\{prefix\}")
 set(libdir "\$\{exec_prefix\}/lib")
 set(includedir "\$\{prefix\}/include")   
-set(CUBA_VERSION "1.0.0")
+set(CUBA_VERSION "4.2.0")
 set(CUBA_LIBRARY_NAME "cuba")
 configure_file("cuba.pc.in" "cuba.pc" @ONLY)
 
diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt
index 5a45a757..30b067ad 100644
--- a/src/external/libZFRelaxation/CMakeLists.txt
+++ b/src/external/libZFRelaxation/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(ZFRelaxation ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase BMWtools) # //as35 cuba lib still missing
+target_link_libraries(ZFRelaxation ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase BMWtools) 
 
 #--- install ZFRelaxation solib -----------------------------------------------
 install(TARGETS ZFRelaxation DESTINATION lib)