fix cmaes_found

phbasler · Jul 16, 2024 · 1f79267 · 1f79267
1 parent 035d3ce
commit 1f79267
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,7 +116,7 @@ if(UseNLopt)
 
 endif(UseNLopt)
 
-if(NOT libcmaes_FOUND AND NOT NLopt_FOUND)
+if(NOT cmaes_FOUND AND NOT NLopt_FOUND)
   message(FATAL_ERROR "You need at least libcmaes or NLopt.")
 endif()
 
@@ -179,7 +179,7 @@ if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
       Spline
       ASCIIPlotter
       BSMPT_Config)
-  if(libcmaes_FOUND)
+  if(cmaes_FOUND)
     list(APPEND ExportList Minimizer_CMAES)
   endif()
   if(NLopt_FOUND)

diff --git a/include/BSMPT/config.h.in b/include/BSMPT/config.h.in
@@ -1,6 +1,6 @@
 #pragma once
 
-#cmakedefine libcmaes_FOUND
+#cmakedefine cmaes_FOUND
 #cmakedefine NLopt_FOUND
 #cmakedefine Boost_FOUND
 #cmakedefine nlohmann_json_FOUND
diff --git a/include/BSMPT/minimizer/Minimizer.h b/include/BSMPT/minimizer/Minimizer.h
@@ -33,7 +33,7 @@ const bool UseGSLDefault = true;
 /**
  * @brief UseLibCMAESDefault Use the Libcmaes minimizer in the default settings
  */
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
 const bool UseLibCMAESDefault = true;
 #else
 const bool UseLibCMAESDefault = false;

diff --git a/src/minimizer/CMakeLists.txt b/src/minimizer/CMakeLists.txt
@@ -16,7 +16,7 @@ target_sources(
   PUBLIC MinimizeGSL.cpp Minimizer.cpp MinimizePlane.cpp
   PUBLIC ${header})
 
-if(libcmaes_FOUND)
+if(cmaes_FOUND)
   add_subdirectory(LibCMAES)
   target_link_libraries(Minimizer PUBLIC Minimizer_CMAES)
 endif()

diff --git a/src/minimizer/LibCMAES/CMakeLists.txt b/src/minimizer/LibCMAES/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(Minimizer_CMAES INTERFACE Minimizer)
 
 # target_link_libraries(Minimizer_CMAES INTERFACE libcmaes::cmaes)
 target_link_libraries(Minimizer_CMAES
-                      INTERFACE "$<LINK_LIBRARY:WHOLE_ARCHIVE,libcmaes::cmaes>")
+                      INTERFACE libcmaes::cmaes)
 if(OpenMP_FOUND)
   target_link_libraries(Minimizer_CMAES INTERFACE OpenMP::OpenMP_CXX)
 endif()

diff --git a/src/minimizer/MinimizePlane.cpp b/src/minimizer/MinimizePlane.cpp
@@ -26,7 +26,7 @@
 
 #include <BSMPT/config.h>
 
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
 #include <BSMPT/minimizer/LibCMAES/MinimizeLibCMAES.h>
 #endif
 
@@ -172,7 +172,7 @@ MinimizePlane(const std::vector<double> &basepoint,
     Minima.push_back(GSLResult.Minimum);
   }
 
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
   if (UseMinimizer.UseCMAES and modelPointer->get_nVEV() >= 3)
   {
     std::vector<double> startCMAES(params.nVEV - 1);

diff --git a/src/minimizer/Minimizer.cpp b/src/minimizer/Minimizer.cpp
@@ -24,7 +24,7 @@
 
 #include <exception>
 
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
 #include <BSMPT/minimizer/LibCMAES/MinimizeLibCMAES.h>
 #endif
 
@@ -69,7 +69,7 @@ MinimizersToUse GetMinimizers(int WhichMinimizer)
   WhichMinimizer /= 2;
   bool UseNLopt = (WhichMinimizer % 2 != 0);
 
-#ifndef libcmaes_FOUND
+#ifndef cmaes_FOUND
   UseCMAES = false;
 #endif
 
@@ -153,7 +153,7 @@ Minimize_gen_all(const std::shared_ptr<Class_Potential_Origin> &modelPointer,
       }
     }
   }
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
   std::thread thread_CMAES;
   LibCMAES::LibCMAESReturn LibCMAES;
   if (UseMinimizer.UseCMAES)
@@ -210,7 +210,7 @@ Minimize_gen_all(const std::shared_ptr<Class_Potential_Origin> &modelPointer,
   }
 #endif
 
-#ifdef libcmaes_FOUND
+#ifdef cmaes_FOUND
   if (UseMultithreading and thread_CMAES.joinable())
   {
     Logger::Write(LoggingLevel::MinimizerDetailed, "Waiting for CMAES Thread");

diff --git a/tools/cmake/BSMPTConfig.cmake.in b/tools/cmake/BSMPTConfig.cmake.in
@@ -14,9 +14,9 @@ find_dependency(GSL @GSL_VERSION@)
 find_dependency(OpenMP @OpenMP_CXX_VERSION@)
 find_dependency(Threads @Threads_VERSION@)
 
-if(@libcmaes_FOUND@ AND NOT @EXPORT_CMAES@)
+if(@cmaes_FOUND@ AND NOT @EXPORT_CMAES@)
   find_dependency(libcmaes)
-endif(@libcmaes_FOUND@ AND NOT @EXPORT_CMAES@)
+endif(@cmaes_FOUND@ AND NOT @EXPORT_CMAES@)
 
 if(@NLopt_FOUND@)
   find_dependency(NLopt @NLopt_VERSION@)