Rollback thrift to 0.13.0 (#87)

* Rollback thrift to 0.13.0 * Added an option to build shared library for proxyfmu-client (default: shared)
open-simulation-platform · Feb 8, 2023 · 93cecf9 · 93cecf9
1 parent b9fca15
commit 93cecf9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ message("Current ${PROJECT_NAME} version: ${CMAKE_PROJECT_VERSION}\n")
 # Build settings
 # ==============================================================================
 
-set(BUILD_SHARED_LIBS OFF)
+option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
 option(PROXYFMU_BUILD_TESTS "Build tests" OFF)
 option(PROXYFMU_BUILD_EXAMPLES "Build examples" OFF)
 

diff --git a/conanfile.py b/conanfile.py
@@ -17,14 +17,21 @@ class ProxyFmuConan(ConanFile):
     requires = (
         "cli11/2.3.1",
         "fmilibrary/2.3",
-        "thrift/0.17.0"
+        "thrift/0.13.0"
+    )
+    options = {
+        "shared": [True, False]
+    }
+    default_options = (
+        "shared=True"
     )
 
     def set_version(self):
         self.version = tools.load(path.join(self.recipe_folder, "version.txt")).strip()
 
     def configure_cmake(self):
         cmake = CMake(self)
+        cmake.definitions["BUILD_SHARED_LIBS"] = self.options.shared
         cmake.configure()
         return cmake