Skip to content

Commit 452c66d

Browse files
authored
Merge pull request #7 from scipopt/hedtke-windows
Export symbols on Windows
2 parents 6e28f16 + 49abef7 commit 452c66d

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cmake_minimum_required(VERSION 3.15.7)
22
project(ScipPP LANGUAGES CXX)
33
set(CMAKE_CXX_STANDARD 17)
4+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
45

56
option(USE_COVERAGE "Create coverage report." OFF)
67
option(BUILD_TESTS "Build tests." OFF)

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
44

55
## [Unreleased] - [Doc:Unreleased]
66

7+
## [1.0.2] - 2023-08-12
8+
9+
### Fixed
10+
11+
- [PR7](https://github.com/scipopt/SCIPpp/pull/7)
12+
Export symbols on Windows.
13+
714
## [1.0.1] - 2023-08-10
815

916
### Added
@@ -22,5 +29,6 @@ Initial release
2229

2330
[Doc:Unreleased]: https://scipopt.github.io/SCIPpp/
2431
[Unreleased]: https://github.com/scipopt/SCIPpp
32+
[1.0.2]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.2
2533
[1.0.1]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.1
2634
[1.0.0]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.0

conanfile.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@ def configure(self):
6161
self.options.rm_safe("fPIC")
6262

6363
def set_version(self):
64-
git = Git(self, folder=self.recipe_folder)
65-
try:
66-
self._full_version = git.run("describe --tags --dirty=-d").strip()
67-
self.version = self._full_version.split('-')[0]
68-
except:
69-
self.version = "1.0.0"
64+
if self.version is None:
65+
git = Git(self, folder=self.recipe_folder)
66+
try:
67+
self._full_version = git.run("describe --tags --dirty=-d").strip()
68+
self.version = self._full_version.split('-')[0]
69+
except:
70+
self.version = "1.0.2"
71+
else:
72+
self._full_version = self.version
7073

7174
def layout(self):
7275
cmake_layout(self)

0 commit comments

Comments
 (0)