stardis-solver

commit e59857a2ed0a5e7adebea69409704804411011c5
parent 8d5b233078b4b2969d9a52d27eccdd0319d7b3c8
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Sat, 27 Apr 2024 15:09:29 +0200

Merge branch 'release_0.15.2'

Diffstat:
M
Makefile
 | 
2
++
M
README.md
 | 
5
+++++
M
config.mk
 | 
2
+-
M
sdis.pc.in
 | 
3
++-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -116,6 +116,7 @@ pkg:
 	    -e 's#@SENC2D_VERSION@#$(SENC2D_VERSION)#g'\
 	    -e 's#@SENC3D_VERSION@#$(SENC3D_VERSION)#g'\
 	    -e 's#@SSP_VERSION@#$(SSP_VERSION)#g'\
+	    -e 's#@SWF_VERSION@#$(SWF_VERSION)#g'\
 	    -e 's#@MPI@#$(PKG_$(DISTRIB_PARALLELISM))#g'\
 	    sdis.pc.in > sdis.pc
 
@@ -129,6 +130,7 @@ sdis-local.pc: sdis.pc.in config.mk
 	    -e 's#@SENC2D_VERSION@#$(SENC2D_VERSION)#g'\
 	    -e 's#@SENC3D_VERSION@#$(SENC3D_VERSION)#g'\
 	    -e 's#@SSP_VERSION@#$(SSP_VERSION)#g'\
+	    -e 's#@SWF_VERSION@#$(SWF_VERSION)#g'\
 	    -e 's#@MPI@#$(PKG_$(DISTRIB_PARALLELISM))#g'\
 	    sdis.pc.in > $@
 
diff --git a/README.md b/README.md
@@ -158,6 +158,11 @@ Edit config.mk as needed, then run:
 
 ## Release notes
 
+### Version 0.15.2
+
+Correction of pkg-config file. A missing private dependency could lead
+to link editing errors when the user statically links to the library.
+
 ### Version 0.15.1
 
 Make the radiative environment time-dependent, so that it can vary not
diff --git a/config.mk b/config.mk
@@ -1,6 +1,6 @@
 VERSION_MAJOR = 0
 VERSION_MINOR = 15
-VERSION_PATCH = 1
+VERSION_PATCH = 2
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
 PREFIX = /usr/local
 
diff --git a/sdis.pc.in b/sdis.pc.in
@@ -9,7 +9,8 @@ Requires: \
  star-sp >= @SSP_VERSION@
 Requires.private:\
  senc2d >= @SENC3D_VERSION@,\
- senc3d >= @SENC3D_VERSION@ @MPI@
+ senc3d >= @SENC3D_VERSION@, \
+ swf >= @SWF_VERSION@ @MPI@
 Name: sdis
 Description: Stardis Solver
 Version: @VERSION@