Skip to content

Commit 07c8871

Browse files
restenbmarkaren
andauthored
preparing for 0.10.1 release (#728)
* preparing for 0.10.1 release * 0.10.1 patch release * 0.10.1 patch release * Update conanfile.py Co-authored-by: Lars Ivar Hatledal <laht@ntnu.no>
1 parent b6f9f27 commit 07c8871

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ All notable changes to libcosim will be documented in this file. This includes n
33

44
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
55

6+
### [v0.10.1] - 2022-12-08
7+
##### Changed
8+
* Update to proxyfmu 0.3.0 due to downstream build issues related to Thrift.
9+
610
### [v0.10.0] - 2022-12-02
711
##### Changed
812
* 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
207211
[v0.8.3]: https://github.com/open-simulation-platform/cse-core/compare/v0.8.2...v0.8.3
208212
[v0.9.0]: https://github.com/open-simulation-platform/cse-core/compare/v0.8.3...v0.9.0
209213
[v0.10.0]: https://github.com/open-simulation-platform/cse-core/compare/v0.9.0...v0.10.0
214+
[v0.10.1]: https://github.com/open-simulation-platform/cse-core/compare/v0.10.0...v0.10.1

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ set(LIBCOSIM_EXPORT_TARGET "${PROJECT_NAME}-targets")
9999
# ==============================================================================
100100

101101
if(LIBCOSIM_USING_CONAN)
102-
103-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}")
104-
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}")
105-
106102
if(NOT LIBCOSIM_USING_CONAN_AUTO_CONFIG OR CONAN_EXPORTED)
107103
# Opting for manual invocation of conan install prior to loading CMake
108104
# or conan create has been invoked, setting CONAN_EXPORTED.

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LibcosimConan(ConanFile):
1414
"revision": "auto"
1515
}
1616
settings = "os", "compiler", "build_type", "arch"
17-
generators = "cmake", "cmake_find_package", "virtualrunenv"
17+
generators = "cmake", "virtualrunenv"
1818
requires = (
1919
"boost/1.71.0",
2020
"fmilibrary/2.3",
@@ -53,7 +53,7 @@ def configure(self):
5353

5454
def requirements(self):
5555
if self.options.proxyfmu:
56-
self.requires("proxyfmu/0.2.9@osp/stable")
56+
self.requires("proxyfmu/0.3.0@osp/stable")
5757

5858
def imports(self):
5959
binDir = os.path.join("output", str(self.settings.build_type).lower(), "bin")

0 commit comments

Comments
 (0)