Merge branch 'develop' of https://github.com/OpenMS/OpenMS into qt6

cbielow · Oct 25, 2024 · c8fade6 · c8fade6
2 parents c44c453 + 2f56677
commit c8fade6
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 74 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -27,6 +27,9 @@ Misc:
 - FeatureFinderMetabo
     - added report_smoothed_intensities parameter (#7594)
 
+Fixes:
+- OpenMS does not compile when using GLPK (instead of COINOR) (#7626)
+
 ------------------------------------------------------------------------------------------
 ----                                OpenMS 3.2.0       (released 09/2024)             ----
 ------------------------------------------------------------------------------------------

diff --git a/cmake/Modules/FindCOIN.cmake b/cmake/Modules/FindCOIN.cmake
@@ -56,10 +56,10 @@ find_path(COIN_SYS_INCLUDE_DIR coin/CoinUtilsConfig.h coinutils/coin/CoinUtilsCo
 
 if (COIN_SYS_INCLUDE_DIR)
   set(COIN_INCLUDE_DIR ${COIN_SYS_INCLUDE_DIR})
-  set(CF_COIN_INCLUDE_SUBDIR_IS_COIN 1 CACHE BOOL "If the subdir for including coin-or headers is coin (1) or coin-or (0).")
+  set(OPENMS_HAS_COIN_INCLUDE_SUBDIR_IS_COIN 1 CACHE BOOL "If the subdir for including coin-or headers is 'coin' (1) or 'coin-or' (undefined).")
 elseif (COIN_VCPKG_INCLUDE_DIR)
   set(COIN_INCLUDE_DIR ${COIN_VCPKG_INCLUDE_DIR})
-  set(CF_COIN_INCLUDE_SUBDIR_IS_COIN 0 CACHE BOOL "If the subdir for including coin-or headers is coin (1) or coin-or (0).")
+  unset(OPENMS_HAS_COIN_INCLUDE_SUBDIR_IS_COIN)
 endif() # find_package_handle_standard_args will handle missingness
 
 # helper macro to find specific coin sub-libraries

diff --git a/cmake/build_system_macros.cmake b/cmake/build_system_macros.cmake
@@ -36,7 +36,7 @@ macro(find_boost)
     "1.75.1" "1.75.0" "1.75"
     "1.74.1" "1.74.0" "1.74")
 
-  find_package(Boost 1.74.0 COMPONENTS ${ARGN} REQUIRED)
+  find_package(Boost 1.74.0 COMPONENTS ${ARGN} REQUIRED CONFIG)
 
 endmacro(find_boost)
 

diff --git a/cmake/cmake_findExternalLibs.cmake b/cmake/cmake_findExternalLibs.cmake
@@ -117,7 +117,7 @@ endif()
 # Our find module creates an imported CoinOR::CoinOR target
 find_package(COIN)
 if (COIN_FOUND)
-  set(CF_USECOINOR 1)
+  set(OPENMS_HAS_COINOR 1)
   set(LPTARGET "CoinOR::CoinOR")
 else()
   #------------------------------------------------------------------------------

diff --git a/src/openms/configh.cmake b/src/openms/configh.cmake
@@ -101,7 +101,6 @@ file (GENERATE
 add_custom_command (
 		COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CONFIGURED_BUILD_CONFIG_H}" "${CONFIGURED_BUILD_CONFIG_CURRENT_H}"
 		VERBATIM
-		PRE_BUILD
 		DEPENDS  "${CONFIGURED_BUILD_CONFIG_H}"
 		OUTPUT   "${CONFIGURED_BUILD_CONFIG_CURRENT_H}"
 		COMMENT  "creating build_config.h file ({event: PRE_BUILD}, {filename: build_config.h})"

diff --git a/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h b/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h
@@ -22,7 +22,7 @@
 class CoinModel;
 
 // if GLPK was found:
-#ifndef COINOR_SOLVER
+#ifndef OPENMS_HAS_COINOR
   #ifndef GLP_PROB_DEFINED
     #define GLP_PROB_DEFINED
     // depending on the glpk version
@@ -107,7 +107,7 @@ namespace OpenMS
     enum SOLVER
     {
       SOLVER_GLPK = 0
-#if COINOR_SOLVER == 1
+#ifdef OPENMS_HAS_COINOR
       , SOLVER_COINOR
 #endif
     };
@@ -285,7 +285,7 @@ namespace OpenMS
     SOLVER getSolver() const;
 
 protected:
-#if COINOR_SOLVER == 1
+#ifdef OPENMS_HAS_COINOR
     CoinModel * model_ = nullptr;
     std::vector<double> solution_;
 #else

diff --git a/src/openms/include/OpenMS/config.h.in b/src/openms/include/OpenMS/config.h.in
@@ -128,8 +128,8 @@ static constexpr cstr past_last_slash(cstr str)
 #define OPENMS_BOOST_VERSION_SUBMINOR @CF_OPENMS_BOOST_VERSION_SUBMINOR@
 #define OPENMS_BOOST_VERSION @CF_OPENMS_BOOST_VERSION@
 
-#define COINOR_SOLVER @CF_USECOINOR@
-#define COIN_INCLUDE_SUBDIR_IS_COIN @CF_COIN_INCLUDE_SUBDIR_IS_COIN@
+#cmakedefine OPENMS_HAS_COINOR
+#cmakedefine OPENMS_HAS_COIN_INCLUDE_SUBDIR_IS_COIN
 
 #define OPENMS_GLPK_VERSION @CF_OPENMS_GLPK_VERSION@
 #define OPENMS_GLPK_VERSION_MAJOR @CF_OPENMS_GLPK_VERSION_MAJOR@