Merge branch 'develop' into new-dl-api

kul-optec · Jan 31, 2024 · 3338852 · 3338852
2 parents 76f42e5 + dec8b78
commit 3338852
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -204,9 +204,14 @@ if (ALPAQA_WITH_DL)
     target_link_libraries(dl-loader
         PUBLIC alpaqa::alpaqa alpaqa::dl-api
         PRIVATE ${CMAKE_DL_LIBS} alpaqa::warnings)
+    alpaqa_configure_visibility(dl-loader)
     set_target_properties(dl-loader PROPERTIES SOVERSION ${PROJECT_VERSION})
     add_library(alpaqa::dl-loader ALIAS dl-loader)
     list(APPEND ALPAQA_INSTALL_TARGETS dl-loader)
+    generate_export_header(dl-loader
+        EXPORT_FILE_NAME export/alpaqa/dl-loader-export.h)
+    target_include_directories(dl-loader PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/export>)
 endif()
 
 if (ALPAQA_WITH_CUTEST AND CMAKE_DL_LIBS)

diff --git a/src/interop/dl/include/alpaqa/dl/dl-problem.hpp b/src/interop/dl/include/alpaqa/dl/dl-problem.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <alpaqa/config/config.hpp>
+#include <alpaqa/dl-loader-export.h>
 #include <alpaqa/dl/dl-problem.h>
 #include <alpaqa/problem/box-constr-problem.hpp>
 #include <alpaqa/problem/sparsity.hpp>
@@ -92,7 +93,7 @@ class ExtraFuncs {
 /// @see @ref   TypeErasedProblem
 /// @see @ref   alpaqa_problem_functions_t
 /// @see @ref   alpaqa_problem_register_t
-class DLProblem : public BoxConstrProblem<DefaultConfig> {
+class DL_LOADER_EXPORT DLProblem : public BoxConstrProblem<DefaultConfig> {
   public:
     USING_ALPAQA_CONFIG(DefaultConfig);
     using Sparsity = alpaqa::Sparsity<config_t>;
@@ -221,7 +222,7 @@ class DLProblem : public BoxConstrProblem<DefaultConfig> {
 ///
 /// @ingroup    grp_Problems
 /// @see @ref   TypeErasedControlProblem
-class DLControlProblem {
+class DL_LOADER_EXPORT DLControlProblem {
   public:
     USING_ALPAQA_CONFIG(DefaultConfig);
     using Box = alpaqa::Box<config_t>;