From 3f890e80afc9239526096aae59849df468a01216 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 31 Aug 2013 15:12:26 +0000 Subject: [PATCH] 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 --- deal.II/cmake/config/Make.global_options.in | 9 +++++++++ deal.II/doc/news/changes.h | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) 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.
  1. - Fixed: The flag DEAL_II_WITH_THREADS that is exported into - the legacy file common/Make.global_options was not set - properly. + Fixed: common/Make.global_options now exports enable-threads + correctly, furthermore, lib-suffix, shared-lib-suffix + and static-lib-suffix are now exported as well for better legacy + support.
    (Matthias Maier, 2013/08/30)
  2. -- 2.39.5