From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Sat, 31 Aug 2013 15:12:26 +0000 (+0000)
Subject: CMake: Also export the old lib-suffix variables in Make.global_options
X-Git-Tag: v8.1.0~917
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186b33aacbd693b4706633feda87affece19237e;p=dealii.git

CMake: Also export the old lib-suffix variables in Make.global_options

git-svn-id: https://svn.dealii.org/trunk@30543 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/cmake/config/Make.global_options.in b/deal.II/cmake/config/Make.global_options.in
index a32109a464..cc00835e74 100644
--- a/deal.II/cmake/config/Make.global_options.in
+++ b/deal.II/cmake/config/Make.global_options.in
@@ -66,6 +66,15 @@ DEAL_II_USE_MPI      = @MAKEFILE_MPI@
 OBJEXT     = o
 EXEEXT     =
 
+shared-lib-suffix = .so
+static-lib-suffix = .a
+
+ifeq ($(enable-shared),yes)
+  lib-suffix = $(shared-lib-suffix)
+else
+  lib-suffix = $(static-lib-suffix)
+endif
+
 
 # set paths to all the libraries we need:
 lib-deal2.o     = @MAKEFILE_TARGETS_RELEASE@
diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index dfaee2546e..c99ce95f9d 100644
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -69,9 +69,10 @@ inconvenience this causes.
 
 <ol>
   <li>
-  Fixed: The flag <code>DEAL_II_WITH_THREADS</code> that is exported into
-  the legacy file <code>common/Make.global_options</code> was not set
-  properly.
+  Fixed: <code>common/Make.global_options</code> now exports enable-threads
+  correctly, furthermore, <code>lib-suffix</code>, <code>shared-lib-suffix</code>
+  and <code>static-lib-suffix</code> are now exported as well for better legacy
+  support.
   <br>
   (Matthias Maier, 2013/08/30)
   </li>