]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
On the quest to get a working Make.global_options
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 23 Sep 2012 18:11:25 +0000 (18:11 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 23 Sep 2012 18:11:25 +0000 (18:11 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26647 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_cond_set_to_yes.cmake [new file with mode: 0644]
deal.II/config/CMakeLists.txt
deal.II/config/Make.global_options.in

diff --git a/deal.II/cmake/macros/macro_cond_set_to_yes.cmake b/deal.II/cmake/macros/macro_cond_set_to_yes.cmake
new file mode 100644 (file)
index 0000000..21c25a1
--- /dev/null
@@ -0,0 +1,14 @@
+
+#
+# IF(bool), set variable to "yes".
+#
+# Usage:
+#     COND_SET_TO_YES(bool variable)
+#
+
+MACRO(COND_SET_TO_YES bool variable)
+  IF(${bool})
+    SET(${variable} "yes")
+  ENDIF()
+ENDMACRO()
+
index 1a38b906701250883f4a7850c4458add8b2a12a8..2f62b4d974d840b25012105ff8e50d0872c1702e 100644 (file)
@@ -78,15 +78,22 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
     "${CMAKE_SHARED_LINKER_FLAGS} ${MAKEFILE_LIBS}"
     )
 
-  IF(DEAL_II_WITH_TBB)
-    SET(MAKEFILE_enablethreads "yes")
-  ENDIF()
-  IF(DEAL_II_WITH_FUNCTIONPARSER)
-    SET(MAKEFILE_enableparser "yes")
-  ENDIF()
-  IF(BUILD_SHARED_LIBS)
-    SET(MAKEFILE_enableshared "yes")
-  ENDIF()
+  #
+  # Boilerplate: The Make.global_options expects variables to be set to
+  # yes, as is common for Makefiles.
+  #
+  COND_SET_TO_YES(DEAL_II_WITH_TBB MAKEFILE_enablethreads)
+  COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
+  COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
+
+  COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
+  COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS)
+  COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK)
+  COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)
+  COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS)
+  COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK)
+  COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST)
+  COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI)
 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in
index be1734be0d8ba080801c19eef07cda5533112bf9..1f3e760dc040c69b32f4459afd46c280ae0a9bf1 100644 (file)
@@ -87,15 +87,15 @@ DEAL_II_MINOR        = @DEAL_II_MINOR@
 #DEAL_II_SLEPC_VERSION_MINOR    = @DEAL_II_SLEPC_VERSION_MINOR@
 #DEAL_II_SLEPC_VERSION_SUBMINOR = @DEAL_II_SLEPC_VERSION_SUBMINOR@
 
-#USE_CONTRIB_TRILINOS = @USE_CONTRIB_TRILINOS@
-#DEAL_II_TRILINOS_INCDIR = @DEAL_II_TRILINOS_INCDIR@
-#DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@
-#DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@
-#DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@
-#DEAL_II_TRILINOS_VERSION_MAJOR    = @DEAL_II_TRILINOS_VERSION_MAJOR@
-#DEAL_II_TRILINOS_VERSION_MINOR    = @DEAL_II_TRILINOS_VERSION_MINOR@
-#DEAL_II_TRILINOS_VERSION_SUBMINOR = @DEAL_II_TRILINOS_VERSION_SUBMINOR@
-#DEAL_II_TRILINOS_LIBPREFIX = @DEAL_II_TRILINOS_LIBPREFIX@
+USE_CONTRIB_TRILINOS = @MAKEFILE_TRILINOS@
+DEAL_II_TRILINOS_INCDIR = @TRILINOS_INCLUDE_DIRS@ # TODO: This will fail if there is more than one.
+#DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@ # TODO
+#DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@ # TODO
+#DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@ # TODO
+DEAL_II_TRILINOS_VERSION_MAJOR    = @TRILINOS_MAJOR@
+DEAL_II_TRILINOS_VERSION_MINOR    = @TRILINOS_MINOR@
+DEAL_II_TRILINOS_VERSION_SUBMINOR = @TRILINOS_SUBMINOR@
+#DEAL_II_TRILINOS_LIBPREFIX = @DEAL_II_TRILINOS_LIBPREFIX@ # TODO
 
 #USE_CONTRIB_HDF5 = @USE_CONTRIB_HDF5@
 #DEAL_II_HDF5_VERSION = @DEAL_II_HDF5_VERSION@
@@ -104,8 +104,8 @@ DEAL_II_MINOR        = @DEAL_II_MINOR@
 #DEAL_II_HDF5_LDFLAGS = @DEAL_II_HDF5_LDFLAGS@
 #DEAL_II_HDF5_INCDIR = @DEAL_II_HDF5_INCDIR@
 
-#USE_CONTRIB_BLAS   = @USE_CONTRIB_BLAS@
-#USE_CONTRIB_LAPACK = @USE_CONTRIB_LAPACK@
+USE_CONTRIB_BLAS   = @MAKEFILE_BLAS@
+USE_CONTRIB_LAPACK = @MAKEFILE_LAPACK@
 
 #USE_CONTRIB_MUMPS  = @USE_CONTRIB_MUMPS@
 #DEAL_II_MUMPS_DIR  = @DEAL_II_MUMPS_DIR@
@@ -113,21 +113,22 @@ DEAL_II_MINOR        = @DEAL_II_MINOR@
 #DEAL_II_BLACS_DIR  = @DEAL_II_BLACS_DIR@
 #DEAL_II_BLACS_ARCH = @DEAL_II_BLACS_ARCH@
 
-#USE_CONTRIB_ARPACK  = @USE_CONTRIB_ARPACK@
-#DEAL_II_ARPACK_DIR  = @DEAL_II_ARPACK_DIR@
-#DEAL_II_ARPACK_ARCH = @DEAL_II_ARPACK_ARCH@
+USE_CONTRIB_ARPACK  = @MAKEFILE_ARPACK@
+#DEAL_II_ARPACK_DIR  = @DEAL_II_ARPACK_DIR@ # TODO
+#DEAL_II_ARPACK_ARCH = @DEAL_II_ARPACK_ARCH@ # TODO
 
-#USE_CONTRIB_METIS    = @USE_CONTRIB_METIS@
-#DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@
-#DEAL_II_METIS_LIBDIR = @DEAL_II_METIS_LIBDIR@
-#DEAL_II_METIS_INCDIR = @DEAL_II_METIS_INCDIR@
+USE_CONTRIB_METIS    = @USE_CONTRIB_METIS@
+#DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@ # TODO
+#DEAL_II_METIS_LIBDIR = @DEAL_II_METIS_LIBDIR@ # TODO
+#DEAL_II_METIS_INCDIR = @DEAL_II_METIS_INCDIR@ # TODO
 
 #USE_CONTRIB_HSL      = @USE_CONTRIB_HSL@
-#USE_CONTRIB_UMFPACK  = @USE_CONTRIB_UMFPACK@
 
-#USE_CONTRIB_P4EST    = @USE_CONTRIB_P4EST@
-#DEAL_II_P4EST_DIR    = @DEAL_II_P4EST_DIR@
-#DEAL_II_P4EST_LIBDIR_NAME = @DEAL_II_P4EST_LIBDIR_NAME@
+USE_CONTRIB_UMFPACK  = @MAKEFILE_UMFPACK@
+
+USE_CONTRIB_P4EST    = @MAKEFILE_P4EST@
+#DEAL_II_P4EST_DIR    = @DEAL_II_P4EST_DIR@ # TODO
+#DEAL_II_P4EST_LIBDIR_NAME = @DEAL_II_P4EST_LIBDIR_NAME@ # TODO
 
 DEAL_II_USE_MPI      = @MAKEFILE_MPI@
 

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.