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>

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>

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>

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

(cherry picked from commit 0ad82993)

Signed-off-by: Christoph Grüninger <gruenich@dune-project.org>

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

(cherry picked from commit edf71b86)

Signed-off-by: Christoph Grüninger <gruenich@dune-project.org>

(cherry picked from commit e053ef35)

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

Some ^[$BLANK] or [^[$BLANK]^'], where $BLANK is space followed by tab
did not work as a capturing statement in some cases (e.g. opts files
with CONFIGURE_FLAGS="CXX='bla'"). After this patch we use [$NOBLANK]
with NOBLANK=^$space^$tab which works. In addition the other patches
form feature/posix-sed-dunecontrol have been backported to close flyspray
1401.
(cherry picked from commit 6b110c88)

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

DuneCmakePackageConfigHelpers.cmake -> DuneCMakePackageConfigHelpers.cmake
(cherry picked from commit 90ebe897)

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

Apparently it is not available with some older versions of CMake.
Therefore we provide a poor man's alternative for it, if it is
not there.
(cherry picked from commit 4c624058)

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

Debian uses multiarch-triplets (e.g. i386-gnu-linux) when installing
object libraries. These are installed to lib/$multiarch-triplet and not
to lib directly. In CMake this concept is partially supported by
GNUInstallDirs.cmake by setting CMAKE_INSTALL_LIBDIR to
lib/$multiarch-triplet. Unfortunately, this is only half the way through
as we also install libraries that do not differ between architectures (e.g.
our shell libraries.

This patch addes multiarch support for CMake to the best of my knowledge,
which might be limited, though:

- All not architecture dependent libraries are installed below the variable
  DUNE_INSTALL_NONOBJECTLIBDIR, which defaults to lib, but might be adjusted
  by the user.
- If the module ships an object library then the pkg-config and CMake package
  configuration files are installed in lib/$multiarch-triplet/pkg-config and
  lib/$multiarch-triplet/cmake/modules, respectively.
- If not then they are installed in lib/pkg-config and
  lib/cmake/modules, respectively.

Note that for autotool no such difference exists and always the latter approach
is used.
(cherry picked from commit cbdd8182)

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

Somehow I missed some files when committing. this patch fixes this.
(cherry picked from commit 2e987422)

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

Previously, the macros were installed to $(datadir)/cmake/. As we have
some macros in DUNE that might also be in other packages
this may cause conflicts in package managers. With this patch we install
them to $(datadir)/dune/cmake to resolve this issue. Together with the
last patch this will resolve problems  outlined in flyspray
task 813
https://dune-project.org/flyspray/index.php?do=details&task_id=813


I apologize for givin the wrong task number in the previous patch.
(cherry picked from commit 5dd5e160)

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

As Ansgar not the CMake package configuration files are quite generic. This
patch autogenerates them if their templates do not exist in the source tree.
In addition duneproject and am2cmake do not generate the templates as files
in the source tree anymore.
(cherry picked from commit 00aac384)

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

At least for dune-common the CMAKE_MODULE_PATH may be empty
and removing an item from an empty list is an error. This
patch fixes this issue by checking whether th list is empty.
(cherry picked from commit dd2a9b42)

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

When working with installed modules, the cmake scripts and
modules of the current module should take precendence over
any installed ones. This was not the case before this patch.

Furthermore, modules downstream in the
dependency tree should be able to overwrite tests in  modules
that they depend on. This patch more caredfully crafts the
CMAKE_MODULE_PATH to reflect the module dependency in it.
(cherry picked from commit d7a1f326)

Previously, dependencies were not correctly searched for as
required packages. This patch fixes this.
(cherry picked from commit 86f1dc9c)

(cherry picked from commit 518f3fc2)

Signed-off-by: Christoph Grüninger <gruenich@dune-project.org>

Steffen Müthing authored 11 years ago and Markus Blatt committed 11 years ago

Previoulsy CMake always fails to find the __gmpz_abs symbol on my machine, even though it is clearly there.
The test used check_symbol_exists. According to the documentation, check_symbol_exists tries to include the
second argument into a test program to check whether there is a prototype for the first argument, so as the
second argument is a binary, that can't really work... This patch switches over to use check_library_exists.
(cherry picked from commit 79cc2c42)

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

For generating the config.h file we use the HAVE_* variables instead
of the CMake ones *_FOUND, Unfortunately, we sometines to not set
HAVE_* to the value of the *_FOUND vriable but to its name. Usually
we only query whether these variable are set at all. While
this often (except for psurface) does not pose a problem, it is semantically
wrong. Therfore this patch fixes this.

Kudos to Ansgar for pointing to this problem.
(cherry picked from commit e258dbd6)

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

This completes the last patch where we moved its installation directory by
reflecting the new location in the package configuration.
(cherry picked from commit 69352ecc)

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

(cherry picked from commit 6701492a)

Signed-off-by: Christoph Grüninger <gruenich@dune-project.org>

Steffen Müthing authored 11 years ago and Christoph Grüninger committed 11 years ago

As decided in the doodle for FS#1395, really old MPI versions will be
deprecated in the 2.3 release.

This patch adds an additional check to the MPI tests for autotools and
cmake that makes sure the user has an MPI which is at least compliant
with MPI-2.1. If the user's version is older, a warning is generated.

The test uses version macros instead of the more standard runtime
MPI version query interface to avoid problems when cross-compiling.
(cherry picked from commit ac6885f8)

Signed-off-by: Christoph Grüninger <gruenich@dune-project.org>

(cherry picked from commit b9073e97)

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

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

Properly quote variable GMP_FOUND.
Do not reuse variable GMP_FOUND.
(cherry picked from commit 317ae349)

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

Torbjörn Klatt authored 11 years ago and Markus Blatt committed 11 years ago

Previously the module path was a relative to the install
directory. Because of this dependant modules did not find
the macros of dune-common and cmake configure did not succeed.
With this the CMake package configuration file contains the
full path and the macros are found (even if there is no local
dune-common lying around).
(cherry picked from commit db6f61c2)

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

Somehow MPI was never activated for the headercheck. This patch fixes this.
(cherry picked from commit fbfa416b)

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

Cmake by default added a dependeny variable for each headercheck
target. Given the amount of such targets and the fact, that these
dependencies should not be changed by the user, this is unwanted
behaviour. The patch fixes this by removing the variable from the
cache.

The removed lines would be necessary if the included headers
or libraries would be tested. As this is not the case, they can
be safely removed.
The way they were used, every test tried to link to the libraries
amd and umfpack causing every test to fail if the libraries are
not present. The changed declaration of CMAKE_REQUIRED_* should
be encapsulated together with the test inside
  include(CMakePushCheckState)
  cmake_push_check_state()
and
  cmake_pop_check_state()
to ensure that the definitions do not leak the test.

Dominic Kempf authored 11 years ago and Markus Blatt committed 11 years ago

Using variables as part of regex does not work with special characters.
Therefore previously the headercheck failed during configure if e.g.
the modules were located in $HOME/C++/. This patch fixes this by not
using regex to strip the location of the modules from the path any more.

This log message was amended by the pusher.

This patch adds test for both CMake and autotools as the
build system.
UMFPack is used by several dune modules (e.g. fem and istl)
the only common required module by both is common. Therefore
we add the test here to make it usable for all modules.

BTW: These tests are taken from Dominics branch of dune-istl.
     Therefore he deserves the credit for them.

Previously hidden unix files were included in the headercheck.
Unfortunately  emacs(server) tends to produces files such as
.#<headername>. This broke the constructed Makefiles. This patch
excludes such files from the list and fixes the issue.

We now check for METIS_PartGraphKway, which is a symbol that we are actually
using and which is also in the implementation of scotch (see FS#1370)

Avoid upper case commands.

They do not find a package but check for a feature.
This avoids false warnings about not found packages.
Merged FindCXX11Conditional.cmake and FindCXX11Features.cmake.

The patch from ...fce82c7d5ee5 broke the script.
This is the intended behavior.