]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 18:29:07 +0000 (18:29 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 18:29:07 +0000 (18:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26603 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_to_string.cmake
deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake
deal.II/config/CMakeLists.txt
deal.II/config/Make.global_options.in
deal.II/config/deal.IIConfig.cmake.in
deal.II/config/deal.IIConfigVersion.cmake.in

index 2bdd4de45c578db9e39b2edf8e03db7d2e23a9db..7bdb48c68c59d761e652d188682eea818565c323 100644 (file)
@@ -1,15 +1,15 @@
 
 #
-# A small macro used for converting a cmake list <list> into a space
-# separated <string>:
+# A small macro used for converting a list into a space
+# separated string:
 #
 # Usage:
-#     TO_STRING(string list)
+#     TO_STRING(string ${list1} ${list2} ...)
 #
 
-MACRO(TO_STRING variable list)
+MACRO(TO_STRING variable)
   SET(${variable} "")
-  FOREACH(var ${${list}})
+  FOREACH(var  ${ARGN})
     SET(${variable} "${${variable}} ${var}")
   ENDFOREACH()
   STRING(STRIP "${${variable}}" ${variable})
index c4c6ee961630f6e383e9a342188ed5765c3d0867..7df7da7bbda9a981bb1a8ff0aced9c80f6d18551 100644 (file)
@@ -1,16 +1,16 @@
 
 #
-# A small macro used for converting a cmake list <list> into a space
-# separated <string>. This macro adds the string <prefix> in front of each
-# element of the list <list>.
+# A small macro used for converting a cmake list into a space
+# separated string. This macro adds the string "prefix" in front of each
+# element of the list.
 #
 # Usage:
-#     TO_STRING_AND_ADD_PREFIX(string list)
+#     TO_STRING_AND_ADD_PREFIX(string "prefix" ${list1} ${list2} ...)
 #
 
-MACRO(TO_STRING_AND_ADD_PREFIX variable prefix list)
+MACRO(TO_STRING_AND_ADD_PREFIX variable prefix)
   SET(${variable} "")
-  FOREACH(var ${${list}})
+  FOREACH(var ${ARGN})
     SET(${variable} "${${variable}} ${prefix}${var}")
   ENDFOREACH()
   STRING(STRIP "${${variable}}" ${variable})
index 20079211e096378fb6694e369547e36392314826..facfe9181ac7a49581e953aaf53a27a720f0706f 100644 (file)
@@ -14,6 +14,15 @@ IF(DEAL_II_INSTALL_PROJECT_CONFIG)
     ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfig.cmake
     )
 
+  GET_CMAKE_PROPERTY(res VARIABLES)
+  FOREACH(var ${res})
+    IF(var MATCHES "DEAL_II_WITH")
+      FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfig.cmake
+        "SET(${var} ${${var}})\n"
+        )
+    ENDIF()
+  ENDFOREACH()
+
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/deal.IIConfigVersion.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/deal.IIConfigVersion.cmake
@@ -39,15 +48,19 @@ IF(DEAL_II_INSTALL_COMPAT_FILES)
   # actually understands:
   #
 
-  TO_STRING(MAKEFILE_EXTERNAL_LIBRARIES DEAL_II_EXTERNAL_LIBRARIES)
-  TO_STRING(MAKEFILE_LIBRARIES DEAL_II_LIBRARIES)
-  ADD_FLAGS(MAKEFILE_EXTERNAL_LIBRARIES "${MAKEFILE_LIBRARIES}")
+  TO_STRING(MAKEFILE_LIBRARIES
+    ${DEAL_II_EXTERNAL_LIBRARIES}
+    ${DEAL_II_LIBRARIES}
+    )
 
-  TO_STRING(MAKEFILE_EXTERNAL_DEFINITIONS DEAL_II_EXTERNAL_DEFINITIONS)
+  TO_STRING(MAKEFILE_DEFINITIONS
+    ${DEAL_II_EXTERNAL_DEFINITIONS}
+    )
 
-  TO_STRING_AND_ADD_PREFIX(MAKEFILE_EXTERNAL_INCLUDES
+  TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS
     "${CMAKE_INCLUDE_FLAG_C}"
-    DEAL_II_EXTERNAL_INCLUDE_DIRS
+    ${DEAL_II_EXTERNAL_INCLUDE_DIRS}
+    ${DEAL_II_INCLUDE_DIRS}
     )
 
   CONFIGURE_FILE(
index 7eec0c7d22b127718faf3fd83347172a51a848d0..c03acbac8e0b8a2cbb016bb6b4b9f2a2d9c676fd 100644 (file)
@@ -66,28 +66,28 @@ endif
 vpath %@static_lib_suffix@ $(LIBDIR)
 vpath %@shared_lib_suffix@ $(LIBDIR)
 
-OBJEXT     = @CMAKE_CXX_OUTPUT_EXTENSION@
+OBJEXT     = o # TODO: @CMAKE_CXX_OUTPUT_EXTENSION@ :-*
 EXEEXT     = @EXEEXT@ # TODO
 
 
 
 # set paths to all the libraries we need:
-lib-deal2.o     = ${MAKEFILE_EXTERNAL_LIBRARIES}
-lib-deal2.g     = ${MAKEFILE_EXTERNAL_LIBRARIES}
+lib-deal2.o     = ${MAKEFILE_LIBRARIES}
+lib-deal2.g     = ${MAKEFILE_LIBRARIES}
 
 
 # necessary includes:
-INCLUDE = ${MAKEFILE_EXTERNAL_INCLUDES}
+INCLUDE = ${MAKEFILE_INCLUDE_DIRS}
 
 
 # compiler flags for debug and optimized mode
-CXXFLAGS.g   = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_DEBUG@ @MAKEFILE_EXTERNAL_DEFINITIONS@ $(INCLUDE)
-CXXFLAGS.o   = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_RELEASE@ @MAKEFILE_EXTERNAL_DEFINITIONS@ $(INCLUDE)
+CXXFLAGS.g   = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@ $(INCLUDE)
+CXXFLAGS.o   = @CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@ $(INCLUDE)
 
 
 # compile flags for C compiler
-CFLAGS.g   = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_DEBUG@ @MAKEFILE_EXTERNAL_DEFINITIONS@
-CFLAGS.o   = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_RELEASE@ @MAKEFILE_EXTERNAL_DEFINITIONS@
+CFLAGS.g   = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@
+CFLAGS.o   = @CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@
 
 
 ifneq ($(enable-threads),no)
index af86f87948847f3e65695539aab312f6187fe8a0..08f6ce77197d42311789f1e5c75ba094a8de8870 100644 (file)
@@ -69,3 +69,7 @@ SET(DEAL_II_EXTERNAL_LIBRARIES "${DEAL_II_EXTERNAL_LIBRARIES}")
 SET(DEAL_II_EXTERNAL_DEFINITIONS "${DEAL_II_EXTERNAL_DEFINITIONS}")
 
 
+#
+# Feature configuration of the deal.II library
+#
+
index 2acf5956fab321ed08a0b8902c386a65d5be4914..5fe138968c765aec19bae2a7c71fadf6998003eb 100644 (file)
@@ -1,6 +1,6 @@
 
 #
-# A suggested by the cmake documentation
+# As suggested by the cmake documentation
 #
 
 set(PACKAGE_VERSION "@DEAL_II_MAJOR@.@DEAL_II_MINOR@")

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.