Skip to content

Commit

Permalink
Merge pull request #7 from scipopt/hedtke-windows
Browse files Browse the repository at this point in the history
Export symbols on Windows
  • Loading branch information
hedtke authored Aug 12, 2023
2 parents 6e28f16 + 49abef7 commit 452c66d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.15.7)
project(ScipPP LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

option(USE_COVERAGE "Create coverage report." OFF)
option(BUILD_TESTS "Build tests." OFF)
Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased] - [Doc:Unreleased]

## [1.0.2] - 2023-08-12

### Fixed

- [PR7](https://github.com/scipopt/SCIPpp/pull/7)
Export symbols on Windows.

## [1.0.1] - 2023-08-10

### Added
Expand All @@ -22,5 +29,6 @@ Initial release

[Doc:Unreleased]: https://scipopt.github.io/SCIPpp/
[Unreleased]: https://github.com/scipopt/SCIPpp
[1.0.2]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.2
[1.0.1]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.1
[1.0.0]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.0
15 changes: 9 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,15 @@ def configure(self):
self.options.rm_safe("fPIC")

def set_version(self):
git = Git(self, folder=self.recipe_folder)
try:
self._full_version = git.run("describe --tags --dirty=-d").strip()
self.version = self._full_version.split('-')[0]
except:
self.version = "1.0.0"
if self.version is None:
git = Git(self, folder=self.recipe_folder)
try:
self._full_version = git.run("describe --tags --dirty=-d").strip()
self.version = self._full_version.split('-')[0]
except:
self.version = "1.0.2"
else:
self._full_version = self.version

def layout(self):
cmake_layout(self)
Expand Down

0 comments on commit 452c66d

Please sign in to comment.