Adjust build to new separate repo setup

Signed-off-by: Pierre R. Mai <pmai@pmsf.de>

Author: pmai

.github/workflows/protobuf.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Checkout OSI
       uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Setup Python
       uses: actions/setup-python@v5

.gitmodules

@@ -1,4 +1,3 @@
-[submodule "examples/open-simulation-interface"]
-	path = examples/open-simulation-interface
-	url = https://github.com/OpenSimulationInterface/open-simulation-interface.git
-	branch = master
+[submodule "examples/osi-cpp"]
+	path = examples/osi-cpp
+	url = https://github.com/PMSFIT/osi-cpp.git

examples/CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
+project("OSMPExamples")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/")
 
 # Set a default build type if none was specified
@@ -29,11 +30,11 @@ set(OSMP_VERSION_PATCH ${CMAKE_MATCH_1})
 
 set(OSMPVERSION "${OSMP_VERSION_MAJOR}.${OSMP_VERSION_MINOR}.${OSMP_VERSION_PATCH}" CACHE STRING "OSMP Version String")
 
-add_subdirectory( open-simulation-interface )
+add_subdirectory( osi-cpp )
 
-get_directory_property(OSI_VERSION_MAJOR DIRECTORY open-simulation-interface DEFINITION VERSION_MAJOR)
-get_directory_property(OSI_VERSION_MINOR DIRECTORY open-simulation-interface DEFINITION VERSION_MINOR)
-get_directory_property(OSI_VERSION_PATCH DIRECTORY open-simulation-interface DEFINITION VERSION_PATCH)
+get_directory_property(OSI_VERSION_MAJOR DIRECTORY osi-cpp DEFINITION VERSION_MAJOR)
+get_directory_property(OSI_VERSION_MINOR DIRECTORY osi-cpp DEFINITION VERSION_MINOR)
+get_directory_property(OSI_VERSION_PATCH DIRECTORY osi-cpp DEFINITION VERSION_PATCH)
 set(OSIVERSION "${OSI_VERSION_MAJOR}.${OSI_VERSION_MINOR}.${OSI_VERSION_PATCH}")
 
 include_directories( includes )

examples/CMakePresets.json

@@ -0,0 +1,19 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "vcpkg",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+      }
+    },
+    {
+      "name": "vcpkg-windows",
+      "inherits": "vcpkg",
+      "cacheVariables": {
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static-md"
+      }
+    }
+  ]
+}

examples/OSMPCNetworkProxy/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(OSMPCNetworkProxy)
 
 set(PUBLIC_LOGGING OFF CACHE BOOL "Enable logging via FMI logger")

examples/OSMPDummySensor/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(OSMPDummySensor)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -23,7 +23,7 @@ string(MD5 FMUGUID modelDescription.in.xml)
 configure_file(modelDescription.in.xml modelDescription.xml @ONLY)
 configure_file(OSMPDummySensorConfig.in.h OSMPDummySensorConfig.h)
 
-find_package(Protobuf 2.6.1 REQUIRED)
+find_package(Protobuf REQUIRED)
 add_library(OSMPDummySensor SHARED OSMPDummySensor.cpp)
 set_target_properties(OSMPDummySensor PROPERTIES PREFIX "")
 target_compile_definitions(OSMPDummySensor PRIVATE "FMU_SHARED_OBJECT")

examples/OSMPDummySource/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(OSMPDummySource)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -23,7 +23,7 @@ string(MD5 FMUGUID modelDescription.in.xml)
 configure_file(modelDescription.in.xml modelDescription.xml @ONLY)
 configure_file(OSMPDummySourceConfig.in.h OSMPDummySourceConfig.h)
 
-find_package(Protobuf 2.6.1 REQUIRED)
+find_package(Protobuf REQUIRED)
 add_library(OSMPDummySource SHARED OSMPDummySource.cpp)
 set_target_properties(OSMPDummySource PROPERTIES PREFIX "")
 target_compile_definitions(OSMPDummySource PRIVATE "FMU_SHARED_OBJECT")

examples/open-simulation-interface

@@ -0,0 +1,14 @@
+{
+  "default-registry": {
+    "kind": "git",
+    "baseline": "4f8fe05871555c1798dbcb1957d0d595e94f7b57",
+    "repository": "https://github.com/microsoft/vcpkg"
+  },
+  "registries": [
+    {
+      "kind": "artifact",
+      "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
+      "name": "microsoft"
+    }
+  ]
+}