diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf8ce41..08b70df6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to libcosim will be documented in this file. This includes n This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) +### [v0.10.1] - 2022-12-08 +##### Changed +* Update to proxyfmu 0.3.0 due to downstream build issues related to Thrift. + ### [v0.10.0] - 2022-12-02 ##### Changed * GCC7 and GCC8 artifact builds have been removed, and GCC9 artifact builds added. This is currently the only supported GCC version. @@ -207,3 +211,4 @@ First OSP JIP partner release [v0.8.3]: https://github.com/open-simulation-platform/cse-core/compare/v0.8.2...v0.8.3 [v0.9.0]: https://github.com/open-simulation-platform/cse-core/compare/v0.8.3...v0.9.0 [v0.10.0]: https://github.com/open-simulation-platform/cse-core/compare/v0.9.0...v0.10.0 +[v0.10.1]: https://github.com/open-simulation-platform/cse-core/compare/v0.10.0...v0.10.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ee453bf..99da9ff0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,10 +99,6 @@ set(LIBCOSIM_EXPORT_TARGET "${PROJECT_NAME}-targets") # ============================================================================== if(LIBCOSIM_USING_CONAN) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}") - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}") - if(NOT LIBCOSIM_USING_CONAN_AUTO_CONFIG OR CONAN_EXPORTED) # Opting for manual invocation of conan install prior to loading CMake # or conan create has been invoked, setting CONAN_EXPORTED. diff --git a/conanfile.py b/conanfile.py index 32563d71..5add6d54 100755 --- a/conanfile.py +++ b/conanfile.py @@ -14,7 +14,7 @@ class LibcosimConan(ConanFile): "revision": "auto" } settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package", "virtualrunenv" + generators = "cmake", "virtualrunenv" requires = ( "boost/1.71.0", "fmilibrary/2.3", @@ -53,7 +53,7 @@ def configure(self): def requirements(self): if self.options.proxyfmu: - self.requires("proxyfmu/0.2.9@osp/stable") + self.requires("proxyfmu/0.3.0@osp/stable") def imports(self): binDir = os.path.join("output", str(self.settings.build_type).lower(), "bin")