Christoph Grüninger authored 11 years ago and Markus Blatt committed 11 years ago

Dependencies in the dune.module without a required version failed.
(cherry picked from commit 63a24c54)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Christoph Grüninger authored 11 years ago and Markus Blatt committed 11 years ago

Now <= and >= are correctly treated.
(cherry picked from commit 0d9b4675)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Christoph Grüninger authored 11 years ago and Markus Blatt committed 11 years ago

(cherry picked from commit 65fb9105)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

This patch moves the "set +e" command to the correct location during
detection of the multiarch variable. That is is before any
$CXX --print-multiarch call. Now dunecontrol will not fail for compilers
not supporting it.
(cherry picked from commit 503ec712)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Du to typo the length of the modules and version list of the suggestion
differed. This patch fixes this.
(cherry picked from commit 17d244c1)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Due to its desgin of using one static memory pool. The allocator
could not be used in different threads at the same time without
side effects. With this revision each instance will hold its own private
instance of the pool.

There should be no issues with this patch and poolallocator seems to be
mostly used in AMG anyway.
(cherry picked from commit f78ce3a8)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

It is the default any way and people might want to change it via an opts-file.
(cherry picked from commit 75e2716b)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

If we do not do that the length of the list of modules and corresponding versions
will differ as empty values will be neglected when appending to a list
(cherry picked from commit f2668441)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

In this patch we rename dune_process_depedency_tree to
dune_process_depedency_macros because it actually just
include the macros of all modules that we depend on.
I addition we fix a bug that resulted in not executing the module's
own macro if there was only one dependency and now always process
it here.
(cherry picked from commit f026e9b1)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit 8db6e0b5)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit 3ab224de)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

This was lost in the last commit.
(cherry picked from commit fd8019fb)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit b01c7774)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Somehow we ended up putting CMAKE_PROJECT_SOURCE_DIR/lib into the
linker path. There should not be any library there and it should
not be needed for linking anyway. Additionally it causes warnings
in dune-grid-howto. Therefore this patch simply removes it.
(cherry picked from commit dc0673ba)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

The name of the file changed in one of the recent patches. This
change is now also reflected in the install directive. Fixes #1426
(cherry picked from commit 3138d121)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Previously, we used >=0.0. if there was no version information in the
dependes and suggests clause of a dune.module file. This breaks with
the new more strict version checking. Therefore with this revision no
version gets set if it does not appear in dune.module
(cherry picked from commit ce8e8d47)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Before we tried to search for dune-common twice (once without a version
and then with the required version). Unfortunately this breaks because
we are adding the same library target twice. With this patch we only
search for a module once.
(cherry picked from commit b58b8475)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

The temporary file <dune-module>-config-version.tmp!
(cherry picked from commit 9775442a)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

With this patch autotools now creates the file
<dune-module>-config-version.cmake mit autotools. To facilitate this
we added the variables DUNE_MOD_{MAJOR,MINOR,REVISION} to the makefiles.
(cherry picked from commit c0ecc4b1)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Before this patch we always relied on dunecontrol/pkg-config to check
for the correct version. With this patch we include this functionality
also when building packges with dunecontrol for this use part of the version
checking of cmake (or pkg-config if there are packages without CMake support).
Basically we let CMake check wether the major and minor version matches and
afterwards use the information from the dune.module file. This should make
it possible to have several versions of DUNE installed and still always use
the correct version. During fixing these issues we noticed that our version
files were not recognized because the carried the wrong name. Now we use the
correct name <dune-module>-config-version.cmake.
(cherry picked from commit 2d20c167)

Resoved conflicts:
	cmake/modules/DuneMacros.cmake

Christoph Grüninger authored 11 years ago and Markus Blatt committed 11 years ago

This fixes FS#1422.
(cherry picked from commit 806d4f18)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Christoph Grüninger authored 11 years ago and Markus Blatt committed 11 years ago

Replace tabs by spaces.
(cherry picked from commit 3cb196db)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Before this patch we tried setting am_dir for directory with a
DUNE module. If one is working with local modules
(e.g. dune-common and dune-geometry), that are a subset of installed
modules (e.g. dune-common, dune-geometry, and dune-istl), that are all
installed under the same prefix, then modules that are part of the difference
of the set of installed and the set of the local modules caused am_dir to
point to the am directory of the installed dune-common directory.
After this patch  am_dir is only set once, which fixes this behaviour and
flyspray issue #1420
(cherry picked from commit 073167e6)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

One of the latest patches prevent the macros of the current module
form being executed. This patch fixes this by including the module
in the dependency tree.
(cherry picked from commit 58d2e446)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

When making the entries of ALL_DEPENDENCIES unique, we skipped modules that
did not ship a Dune<ModuleName>Macros.cmake macro. This caused their libraries
to be missing in DUNE_LIBS. This patch fixes this situation.
(cherry picked from commit 35d07e22)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Previously we already processed dune.module but in a much later stage during
configure. Dependencies are contained in dune.module. Therefore there is no
need to replicate them in the CMake package configuration files. With this
patch we now always process dune.module directly after finding the DUNE module.
In addition we set ${DUNE_MOD_NAME}_(DEPENDS|SUGGESTS} in the CMake environment.
As with this change DUNE_MOD_NAME will usually be set to to dune-common, we
also changed to using ProjectName and ProjectVersion (the canonical CMake names)
to refer to the current module and version.
(cherry picked from commit 938523a4)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

In the CMake package configuration files generated with autotools
the CMake name of the library target contained a bogus lib in front
of it. This packages fixes this. Now the library can be referenced
in CMake as dunemodule (without dashes).
(cherry picked from commit eada777d)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Oliver Sander authored 11 years ago and Markus Blatt committed 11 years ago

(cherry picked from commit 0c994c60)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Fixes flyspray issue 1418, see https://dune-project.org/flyspray/index.php?do=details&task_id=1418


(cherry picked from commit aae35424)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Christian Engwer authored 11 years ago and Markus Blatt committed 11 years ago

when we try to send data, it might happen, that for some reason we don't want to any data.
This happens, when the dynamic size of our CommPolicy is 0. In that case we must not add a
MessageInformation, otherwise we get an MPI error.(cherry picked from commit 82609fbc)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Somewhere along the many changes we stopped forcing usage of pkg-config when
testing for installed versions of modules during configure. Without using
pkg-config there is no way of detecting custom installation parts used by
the user. In my case, this broke finding modules installed via cmake from
modules that are to built with autotools.

This patch forces DUNE_CHECK_MODULE to use pkg-config to setup the paths for
installed modules by dunecontrol not provinding --with-module=<path> to configure
for installed modules.
(cherry picked from commit 20ef1b87)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit 67df635e)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit 50926312)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Previously we checked whether the extracted Version evaluated to
True. Unfortunately, there lazy people like me that like use a version
of 0 for testing, which evaluates to False and breaks configure.
With this patch we allow 0 to and just test wether the version consists
of characters.
(cherry picked from commit 9afabdcd)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

A variable was not correctly escaped during creation of the file
cmake/modules/Makefile.am causing the error message:
"duneproject: line 914: datadir: command not found."

This patch now correctly escapes it.
(cherry picked from commit af0401cc)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

With new modules there were cases where cmake/modules was not in the
modules path which made configuration fail. This patch fixes this case.
(cherry picked from commit d1011bfe)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

duneproject failed miserably when run with only installed modules. With
this patch we correctly setup the pkg-config and dunecontrol path to
handle this situation. In addition we fixed various issues with the newly
created modules and they now build as exspected.
(cherry picked from commit 3afb1834)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

Due to testing the wrong directories some variables where missing in the
package configuration files. This patch fixes this.
(cherry picked from commit 0826cf14)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>

(cherry picked from commit 9a141d3a5175ac67612aeccd39beb0cad2117f27)

Signed-off-by: Markus Blatt <markus@dr-blatt.de>