From a38250b149b2232a8bab6a5a2fada0f69abad0a1 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 10:01:55 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26713 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 2 +- deal.II/config/CMakeLists.txt | 8 +++++--- deal.II/config/Make.global_options.in | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 42a3c7415e..26daadae5d 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -255,7 +255,7 @@ ADD_SUBDIRECTORY(include) # # Build optional contrib targets: # -ADD_SUBDIRECTORY(contrib) +#ADD_SUBDIRECTORY(contrib) # diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 5a57227ef7..063fa5700a 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -44,8 +44,8 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # # - # Therefore, transform some cmake lists into a string that a Makefile - # actually understands: + # Therefore, transform some cmake lists into a string that the old + # Makefile mechanism actually understands: # TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_C}" @@ -61,10 +61,12 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ENDIF() FOREACH(type ${MAKEFILE_BUILD_TYPES}) - TO_STRING(MAKEFILE_DEFINITIONS_${type} + TO_STRING_AND_ADD_PREFIX(MAKEFILE_DEFINITIONS_${type} + "-D" ${DEAL_II_USER_DEFINITIONS} ${DEAL_II_USER_DEFINITIONS_${type}} ) + # # Add an rpath directive in front of each library, so that libraries # outside of the default search directories will be found by the runtime diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index 71afead97e..e81ec7f79e 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -57,7 +57,7 @@ LDFLAGS = # intentionally left empty and specified in LIBS #F77 #F77-VERSION #F77LIBS -ifeq (${debug-mode}, on) +ifeq ($(debug-mode), on) LIBS = @MAKEFILE_LIBS_DEBUG@ else LIBS = @MAKEFILE_LIBS_RELEASE@ -- 2.39.5