]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add Version.in
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 17:25:44 +0000 (17:25 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 17:25:44 +0000 (17:25 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26319 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/Version.in
deal.II/lib/Makefile [deleted file]

index c54859bbbe5287effcc25e176c4cf093bd5c4de3..8b8c927da13abd246db6c5030616060bc7ce8b36 100644 (file)
@@ -214,6 +214,11 @@ INCLUDE(check_for_compiler_bugs)
 
 ADD_SUBDIRECTORY(common)
 
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Version.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Version
+  )
+
 
 
 
index a24f9877ac158c8e337bae149b7de338eb2b922b..d78bda93422ecbbca8caf772f7b37f8fe3b254e9 100644 (file)
@@ -1 +1 @@
-@PACKAGE_VERSION@
+@VERSION@
diff --git a/deal.II/lib/Makefile b/deal.II/lib/Makefile
deleted file mode 100644 (file)
index ee061d8..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-# $Id$
-
-D = ..
-
-# get options which hold for all files of the project
-include $D/common/Make.global_options
-
-
-default:
-       @echo There is no default target in this directory
-
-
-######################### EXTERNAL LINK TARGETS ###################
-# link in external libs, if any
-external-links: external-links-petsc
-
-ifeq ($(USE_CONTRIB_PETSC),yes)
-
-  # PETSc has the nasty habit of putting debug and optimized builds into
-  # different directories, but naming the respective libraries the same.
-  # Since one doesn't want to always set and reset $LD_LIBRARY_PATH when
-  # one switches from debug to optimized mode, they pass -Wl,-rpath to
-  # the linker line. This is not really portable, and it has the additional
-  # drawback that one has to pass different linker flags for debug and
-  # optimized mode. The latter is a problem with our present build system,
-  # which allows to use different libraries, but doesn't take into account
-  # that one may want to pass different $LDFLAGS.
-  #
-  # To avoid such hassle, we build some kind of convenience library: a shared
-  # library that has no content, but contains references to all the different
-  # PETSc libraries, and we build one for debug and one for optimized mode.
-  # We can't really get around the use of -Wl,-rpath, but at least we
-  # have now centralized this part to one single place, and are back to where
-  # we want to be: have different libraries for debug and optimized mode,
-  # but in the same directory. And, voila, our build system works again :-)
-  #
-  # There is one gotcha: PETSc has a habit of making incompatible changes by
-  # simply changing the names of libraries between different versions. That
-  # really is too bad, so we have to conditionalize things.
-  #
-  # This is how it is done. Starting with PETSc version 3.0.0:
-  ifeq ($(DEAL_II_PETSC_VERSION_MAJOR)$(DEAL_II_PETSC_VERSION_MINOR),30)
-    xlib.g = $(lib-contrib-petsc-path.g)/libpetscksp$(lib-suffix) \
-             $(lib-contrib-petsc-path.g)/libpetscdm$(lib-suffix)  \
-             $(lib-contrib-petsc-path.g)/libpetscmat$(lib-suffix) \
-             $(lib-contrib-petsc-path.g)/libpetscvec$(lib-suffix) \
-             $(lib-contrib-petsc-path.g)/libpetsc$(lib-suffix)
-    xlib.o = $(lib-contrib-petsc-path.o)/libpetscksp$(lib-suffix) \
-             $(lib-contrib-petsc-path.o)/libpetscdm$(lib-suffix)  \
-             $(lib-contrib-petsc-path.o)/libpetscmat$(lib-suffix) \
-             $(lib-contrib-petsc-path.o)/libpetscvec$(lib-suffix) \
-             $(lib-contrib-petsc-path.o)/libpetsc$(lib-suffix)
-
-    # deal with shared libraries:
-    ifeq ($(enable-shared),yes)
-
-      external-links-petsc: libpetscall.g$(shared-lib-suffix) libpetscall$(shared-lib-suffix)
-
-      libpetscall.g$(shared-lib-suffix): $(xlib.g)
-       @echo "======================debug============= Linking library:   libpetscall.g$(shared-lib-suffix)"
-       @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall.g) $(call DEAL_II_ADD_SONAME,petscall.g) $(xlib.g)
-       @ln -f -s $(call DEAL_II_SHLIB_NAME,petscall.g) $@
-
-      libpetscall$(shared-lib-suffix): $(xlib.o)
-       @echo "======================optimized========= Linking library:   libpetscall$(shared-lib-suffix)"
-       @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall) $(call DEAL_II_ADD_SONAME,petscall)  $(xlib.o)
-       @ln -f -s $(call DEAL_II_SHLIB_NAME,petscall) $@
-
-    # and then static libraries:
-    else
-
-      # make static libraries. ensure that they are built one after the other because
-      # both create temporary files with the same name
-      external-links-petsc:
-       @$(MAKE) libpetscall.g$(static-lib-suffix)
-       @$(MAKE) libpetscall$(static-lib-suffix)
-
-      # As I don't know how to merge archives, here's a workaround: Extract each of
-      # the archives and append the object files to the libpetsc archive. Do the
-      # same for debug and optimized mode.
-      libpetscall.g$(static-lib-suffix): $(xlib.g)
-       @echo "======================debug============= Linking library:   libpetscall.g$(static-lib-suffix)"
-       @rm -f $@
-       @rm -rf .ar_tmp
-       @mkdir .ar_tmp; cd .ar_tmp; \
-        for arfile in $(xlib.g) ; do \
-          $(AR) x $$arfile; \
-           $(AR) q ../libpetscall.g$(static-lib-suffix) *; \
-           rm *; \
-        done
-       @cd ..
-       @rm -r .ar_tmp
-       @$(RANLIB) libpetscall.g$(static-lib-suffix)
-
-      libpetscall$(static-lib-suffix): $(xlib.o)
-       @echo "======================optimized========= Linking library:   libpetscall$(static-lib-suffix)"
-       @rm -f $@
-       @rm -rf .ar_tmp
-       @mkdir .ar_tmp; cd .ar_tmp; \
-        for arfile in $(xlib.o) ; do \
-          $(AR) x $$arfile; \
-           $(AR) q ../libpetscall$(static-lib-suffix) *; \
-           rm *; \
-        done
-       @cd ..
-       @rm -r .ar_tmp
-       @$(RANLIB) libpetscall$(static-lib-suffix)
-    endif
-
-  # and this is how it is done with PETSc version >= 3.1.0:
-  else
-    external-links-petsc: # do nothing.
-  endif
-
-else
-  external-links-petsc:
-endif
-
-
-######################### CLEAN TARGETS ###################
-# clean everything
-clean: clean-objects
-
-# only clean object files, not libraries and executables
-clean-objects:  clean-debug clean-optimized \
-               clean-contrib
-
-# clean targets for the individual subdirectories. remove
-# object files and template instantiation files.
-# extract dir name from target
-clean-debug clean-optimized:
-       -cd $(@:clean-%=%) ; rm -f *.$(OBJEXT) *.ti *.ii *.gcda *.gcno
-
-clean-contrib:
-       -rm contrib/*/*.$(OBJEXT)
-       -rm -r contrib/tbb/*debug
-       -rm -r contrib/tbb/*release
-
-distclean: clean
-       -rm -f lib* bin/*
-       -rm bin/detached_ma27
-       -rm bin/dealii_parameter_gui
-       -rm libtbb*
-
-.PHONY: clean clean-objects
-.PHONY: clean-base clean-lac clean-1d clean-2d clean-3d
-.PHONY: clean-contrib
-.PHONY: external-links external-links-petsc

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.