move runtime options out of lib

ERGO-Code · Oct 23, 2024 · 3b63b11 · 3b63b11
1 parent 2fc565a
commit 3b63b11
Show file tree

Hide file tree

Showing 6 changed files with 2,152 additions and 710 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -13,7 +13,7 @@ if(FAST_BUILD)
       set(win_version_file)
     endif()
 
-    target_sources(highs-bin PRIVATE RunHighs.cpp ${win_version_file})
+    target_sources(highs-bin PRIVATE RunHighs.cpp HighsRuntimeOptions.h ${win_version_file})
 
     target_include_directories(highs-bin PRIVATE
       $<BUILD_INTERFACE:${HIGHS_SOURCE_DIR}/app>

diff --git a/src/lp_data/HighsRuntimeOptions.h → app/HighsRuntimeOptions.h b/src/lp_data/HighsRuntimeOptions.h → app/HighsRuntimeOptions.h
@@ -245,7 +245,7 @@ bool loadOptions(const HighsLogOptions& report_log_options, int argc,
         return false;
     }
 
-  } catch (const cxxopts::OptionException& e) {
+  } catch (const cxxopts::exceptions::exception& e) {
     highsLogUser(report_log_options, HighsLogType::kError,
                  "Error parsing options: %s\n", e.what());
     return false;

diff --git a/app/RunHighs.cpp b/app/RunHighs.cpp
@@ -13,7 +13,7 @@
  */
 #include "Highs.h"
 // #include "io/HighsIO.h"
-#include "lp_data/HighsRuntimeOptions.h"
+#include "HighsRuntimeOptions.h"
 
 // uncomment if we will be shutting down task executor from exe
 // #include "parallel/HighsParallel.h"