restructure native library (#130)

Author: markaren

.github/workflows/main.yml

@@ -85,6 +85,9 @@ jobs:
       matrix:
         os: [ubuntu-18.04, windows-2019]
         python-version: [3.7, 3.8, 3.9]
+        exclude:
+          - os: ubuntu-18.04
+            python-version: 3.7
     timeout-minutes: 20
 
     steps:

pythonfmu/pythonfmu-export/CMakeLists.txt

@@ -40,33 +40,6 @@ if (WIN32)
   set(Python3_LIBRARIES ${Python3_LIBRARY_DIRS}/python3.lib)
 endif ()
 
-# ==============================================================================
-# Sources
-# ==============================================================================
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/headers)
-
-set(sources
-        cpp/cppfmu_cs.cpp
-        cpp/fmi_functions.cpp
-        cpp/PySlaveInstance.cpp
-        )
-
-add_library(pythonfmu-export ${sources})
-target_compile_features(pythonfmu-export PUBLIC "cxx_std_17")
-target_include_directories(pythonfmu-export
-        PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
-        "${Python3_INCLUDE_DIRS}"
-        PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-        )
-
-target_link_libraries(pythonfmu-export
-        PRIVATE
-        ${Python3_LIBRARIES}
-        )
-
 if (WIN32)
   set(TARGET_PLATFORM win)
 elseif (APPLE)
@@ -83,14 +56,4 @@ endif ()
 
 message("Building pythonfmu-export for platform ${TARGET_PLATFORM}")
 
-if (WIN32)
-  set_target_properties(pythonfmu-export
-          PROPERTIES
-          RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
-          )
-else ()
-  set_target_properties(pythonfmu-export
-          PROPERTIES
-          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
-          )
-endif ()
+add_subdirectory(src)

pythonfmu/pythonfmu-export/src/CMakeLists.txt

@@ -0,0 +1,44 @@
+
+set(headers
+        cppfmu/cppfmu_cs.hpp
+        cppfmu/cppfmu_common.hpp
+
+        fmi/fmi2Functions.h
+        fmi/fmi2FunctionTypes.h
+        fmi/fmi2TypesPlatform.h
+
+        pythonfmu/PySlaveInstance.hpp
+        pythonfmu/PyState.hpp
+        )
+
+set(sources
+        cppfmu/cppfmu_cs.cpp
+        cppfmu/fmi_functions.cpp
+        pythonfmu/PySlaveInstance.cpp
+        )
+
+add_library(pythonfmu-export ${sources} ${headers})
+target_compile_features(pythonfmu-export PUBLIC "cxx_std_17")
+
+target_include_directories(pythonfmu-export
+        PRIVATE
+        "${Python3_INCLUDE_DIRS}"
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        )
+
+target_link_libraries(pythonfmu-export
+        PRIVATE
+        ${Python3_LIBRARIES}
+        )
+
+if (WIN32)
+  set_target_properties(pythonfmu-export
+          PROPERTIES
+          RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
+          )
+else ()
+  set_target_properties(pythonfmu-export
+          PROPERTIES
+          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
+          )
+endif ()