Auto generate export macro

USEPA · Nov 15, 2023 · 2f40a39 · 2f40a39
1 parent 4800dfe
commit 2f40a39
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 3 deletions.
diff --git a/EPANET2.2 b/EPANET2.2
diff --git a/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(OpenMP)
 
 
 set(EPANETMSX_PUBLIC_HEADERS
-    ${PROJECT_SOURCE_DIR}/include/epanetmsx.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/epanetmsx.h
 )
 
 file(GLOB
@@ -63,6 +63,19 @@ target_link_options(epanetmsx
         ">"
 )
 
+include(GenerateExportHeader)
+generate_export_header(epanetmsx 
+    BASE_NAME epanetmsx
+    EXPORT_MACRO_NAME MSXDLLEXPORT
+    EXPORT_FILE_NAME epanetmsx_export.h
+    STATIC_DEFINE SHARED_EXPORTS_BUILT_AS_STATIC
+)
+
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}/epanetmsx_export.h
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include
+)
+
+
 
 target_link_libraries(epanetmsx
     PUBLIC
@@ -75,7 +88,7 @@ target_link_libraries(epanetmsx
 target_include_directories(epanetmsx
     PUBLIC
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/EPANET2.2/SRC_engines/include>
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:${INCLUDE_DIST}>
 
     PRIVATE

diff --git a/Include/epanet2.bas → src/solver/include/epanet2.bas b/Include/epanet2.bas → src/solver/include/epanet2.bas
diff --git a/Include/epanet2.pas → src/solver/include/epanet2.pas b/Include/epanet2.pas → src/solver/include/epanet2.pas
diff --git a/Include/epanetmsx.bas → src/solver/include/epanetmsx.bas b/Include/epanetmsx.bas → src/solver/include/epanetmsx.bas
diff --git a/Include/epanetmsx.def → src/solver/include/epanetmsx.def b/Include/epanetmsx.def → src/solver/include/epanetmsx.def
diff --git a/Include/epanetmsx.h → src/solver/include/epanetmsx.h b/Include/epanetmsx.h → src/solver/include/epanetmsx.h
diff --git a/Include/epanetmsx.pas → src/solver/include/epanetmsx.pas b/Include/epanetmsx.pas → src/solver/include/epanetmsx.pas
+1 −1		.github/workflows/build-and-test.yml
+11 −0		SRC_engines/CMakeLists.txt
+10 −12		SRC_engines/include/epanet2.h
+1 −17		SRC_engines/include/epanet2_2.h
+10 −6		SRC_engines/src/run/CMakeLists.txt
+27 −9		SRC_engines/src/solver/CMakeLists.txt
+3 −3		SRC_engines/src/solver/version.h