diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01fe15cc..4342f82d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,11 +164,6 @@ if (nexus)
   message(" NeXus   found in ${NEXUS_INCLUDE_DIR}") 
 endif (nexus)
 
-if (BMWlibs)
-  message("")
-  message(" CUBA   found in //as35 STILL MISSING")
-endif (BMWlibs)
-
 message("")
 if (qt_based_tools)
   if (Qt5Core_FOUND)
diff --git a/src/external/libCuba/src/CMakeLists.txt b/src/external/libCuba/src/CMakeLists.txt
index b29724a0..f6fd8f8b 100644
--- a/src/external/libCuba/src/CMakeLists.txt
+++ b/src/external/libCuba/src/CMakeLists.txt
@@ -17,7 +17,7 @@ add_subdirectory(vegas)
 
 #--- lib creation -------------------------------------------------------------
 add_library(cuba SHARED
-  $<TARGET_OBJECTS:workerini>
+  $<TARGET_OBJECTS:common>
   $<TARGET_OBJECTS:cuhre>
   $<TARGET_OBJECTS:divonne>
   $<TARGET_OBJECTS:suave>
diff --git a/src/external/libCuba/src/common/CMakeLists.txt b/src/external/libCuba/src/common/CMakeLists.txt
index b991d841..8265dfea 100644
--- a/src/external/libCuba/src/common/CMakeLists.txt
+++ b/src/external/libCuba/src/common/CMakeLists.txt
@@ -1,13 +1,17 @@
-#--- workerini ----------------------------------------------------------------
+#--- common -------------------------------------------------------------------
+
+set(common_src Global.c)
+set(common_src ${common_src} Data.c)
+if (HAVE_FORK)
+  set(common_src ${common_src} Fork.c)
+endif (HAVE_FORK)
 
 #--- obj lib creation ---------------------------------------------------------
-add_library(workerini OBJECT 
-  WorkerIni.c
-)
+add_library(common OBJECT ${common_src})
 
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
-  workerini BEFORE PRIVATE 
+  common BEFORE PRIVATE 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
@@ -18,6 +22,12 @@ set(COMP_DEF "-DHAVE_CONFIG_H")
 set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
 
 target_compile_definitions(
-  workerini PRIVATE ${COMP_DEF}
+  common PRIVATE ${COMP_DEF}
 )
 
+set(COMP_OPT "-O3")
+set(COMP_OPT ${COMP_OPT} "-fomit-frame-pointer")
+set(COMP_OPT ${COMP_OPT} "-ffast-math")
+target_compile_options(
+  common PRIVATE ${COMP_OPT}
+)
diff --git a/src/external/libCuba/src/cuhre/CMakeLists.txt b/src/external/libCuba/src/cuhre/CMakeLists.txt
index 999b74cf..09d80740 100644
--- a/src/external/libCuba/src/cuhre/CMakeLists.txt
+++ b/src/external/libCuba/src/cuhre/CMakeLists.txt
@@ -17,8 +17,15 @@ target_include_directories(
 #--- check for pre compile flags ----------------------------------------------
 set(COMP_DEF "-DHAVE_CONFIG_H")
 set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
+set(COMP_DEF ${COMP_DEF} "-Dcubafun_=libCuhrecubafun_")
 
 target_compile_definitions(
   cuhre PRIVATE ${COMP_DEF}
 )
 
+set(COMP_OPT "-O3")
+set(COMP_OPT ${COMP_OPT} "-fomit-frame-pointer")
+set(COMP_OPT ${COMP_OPT} "-ffast-math")
+target_compile_options(
+  cuhre PRIVATE ${COMP_OPT}
+)
diff --git a/src/external/libCuba/src/divonne/CMakeLists.txt b/src/external/libCuba/src/divonne/CMakeLists.txt
index b94089e4..b83a5748 100644
--- a/src/external/libCuba/src/divonne/CMakeLists.txt
+++ b/src/external/libCuba/src/divonne/CMakeLists.txt
@@ -17,8 +17,15 @@ target_include_directories(
 #--- check for pre compile flags ----------------------------------------------
 set(COMP_DEF "-DHAVE_CONFIG_H")
 set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
+set(COMP_DEF ${COMP_DEF} "-Dcubafun_=libDivonnecubafun_")
 
 target_compile_definitions(
   divonne PRIVATE ${COMP_DEF}
 )
 
+set(COMP_OPT "-O3")
+set(COMP_OPT ${COMP_OPT} "-fomit-frame-pointer")
+set(COMP_OPT ${COMP_OPT} "-ffast-math")
+target_compile_options(
+  divonne PRIVATE ${COMP_OPT}
+)
diff --git a/src/external/libCuba/src/suave/CMakeLists.txt b/src/external/libCuba/src/suave/CMakeLists.txt
index c4ebdc24..b4a34ba0 100644
--- a/src/external/libCuba/src/suave/CMakeLists.txt
+++ b/src/external/libCuba/src/suave/CMakeLists.txt
@@ -17,8 +17,15 @@ target_include_directories(
 #--- check for pre compile flags ----------------------------------------------
 set(COMP_DEF "-DHAVE_CONFIG_H")
 set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
+set(COMP_DEF ${COMP_DEF} "-Dcubafun_=libSuavecubafun_")
 
 target_compile_definitions(
   suave PRIVATE ${COMP_DEF}
 )
 
+set(COMP_OPT "-O3")
+set(COMP_OPT ${COMP_OPT} "-fomit-frame-pointer")
+set(COMP_OPT ${COMP_OPT} "-ffast-math")
+target_compile_options(
+  suave PRIVATE ${COMP_OPT}
+)
diff --git a/src/external/libCuba/src/vegas/CMakeLists.txt b/src/external/libCuba/src/vegas/CMakeLists.txt
index f4635a3a..983ba14a 100644
--- a/src/external/libCuba/src/vegas/CMakeLists.txt
+++ b/src/external/libCuba/src/vegas/CMakeLists.txt
@@ -17,8 +17,15 @@ target_include_directories(
 #--- check for pre compile flags ----------------------------------------------
 set(COMP_DEF "-DHAVE_CONFIG_H")
 set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
+set(COMP_DEF ${COMP_DEF} "-Dcubafun_=libVegascubafun_")
 
 target_compile_definitions(
   vegas PRIVATE ${COMP_DEF}
 )
 
+set(COMP_OPT "-O3")
+set(COMP_OPT ${COMP_OPT} "-fomit-frame-pointer")
+set(COMP_OPT ${COMP_OPT} "-ffast-math")
+target_compile_options(
+  vegas PRIVATE ${COMP_OPT}
+)