diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index d4c2af8a8c..0363d7dcab 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -29,6 +29,14 @@ if(FAST_BUILD) target_link_libraries(highs-bin highs) + if(APPLE) + set_target_properties(highs-bin PROPERTIES INSTALL_RPATH + "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path") + elseif (UNIX) + set_target_properties(highs-bin PROPERTIES INSTALL_RPATH + "$ORIGIN:$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + endif() + # install the binary install(TARGETS highs-bin EXPORT highs-targets RUNTIME) diff --git a/src/lp_data/HighsCallbackStruct.h b/src/lp_data/HighsCallbackStruct.h index 5ed434f7e3..4553707f61 100644 --- a/src/lp_data/HighsCallbackStruct.h +++ b/src/lp_data/HighsCallbackStruct.h @@ -1,4 +1,3 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* This file is part of the HiGHS linear optimization suite */ /* */ @@ -20,6 +19,10 @@ extern "C" { #endif +/** + * Struct to handle callback output data + * + */ typedef struct { int log_type; // cast of HighsLogType double running_time;