]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 10:01:55 +0000 (10:01 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 10:01:55 +0000 (10:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26713 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/config/CMakeLists.txt
deal.II/config/Make.global_options.in

index 42a3c7415e9c554a169c53093777ba072738a47f..26daadae5d7455fb464b1dd6bc0147ce869eb1cd 100644 (file)
@@ -255,7 +255,7 @@ ADD_SUBDIRECTORY(include)
 #
 # Build optional contrib targets:
 #
-ADD_SUBDIRECTORY(contrib)
+#ADD_SUBDIRECTORY(contrib)
 
 
 #
index 5a57227ef7105da1ac672c017cb311d523234582..063fa5700ab39741d8c48775eed5dc12090138f3 100644 (file)
@@ -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
index 71afead97ed5631a2a5fc7304ada27d0edc3b68d..e81ec7f79e0441f17c73d316f011007c1c82a53a 100644 (file)
@@ -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@

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.