Skip to content

Commit

Permalink
preparing for 0.10.1 release (#728)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
restenb and markaren authored Dec 8, 2022
1 parent b6f9f27 commit 07c8871
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 07c8871

Please sign in to comment.