Skip to content
Snippets Groups Projects
Commit f646a20d authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][Cmake] Manually reapplied patch 6654

Revision 6654
.-----------------
Merge sync to keep track with the trunk.

Thanks for renaming files and targets. Always a pleasure to mimic this manually.


[[Imported from SVN: r7365]]
parent 40650980
No related branches found
No related tags found
No related merge requests found
......@@ -1541,22 +1541,6 @@ you options file the \configure cache is created. Be aware that the file persis
between \dunecontrol runs. If you encounter any problems, you want to change the
configuration or to rerun all checks, the cache file should be removed manually.
\minisec{Faster module search}
If the environment variable \texttt{DUNE\_CONTROL\_PATH} is not set, \dunecontrol
recursively searches for \dune modules below the working directory. Depending on
your installation, this search may take quite a bit of time. It can be
avoided by including the paths to the \texttt{dune.module} files of all modules in
\texttt{DUNE\_CONTROL\_PATH}.
This list of paths can actually be created on the fly by a command.
Let us assume all \dune modules are in one directory, which is the working directory
for \dunecontrol, too. By adding the line
\begin{lstlisting}[language=make,showstringspaces=false]
DUNE_CONTROL_PATH="`ls */dune.module | tr '\n' ':'`"
\end{lstlisting}
to your opts file, no search will be performed. Instead, only the faster, non-recursive
\texttt{ls} command is called.
\section{Further documentation}
\minisec{automake \& Makefile.am}
......
......@@ -10,7 +10,6 @@ set(TESTS
dynvectortest
enumsettest
fassigntest
float_cmp
fmatrixtest
fvectortest
gcdlcmtest
......@@ -36,6 +35,7 @@ set(TESTS
testfassign3
testfassign4
testfconstruct
testfloatcmp
tuplestest_config
tuplestest_dune
tuplestest_tr1
......@@ -92,8 +92,8 @@ add_executable("fassigntest" fassigntest.cc)
target_link_libraries("fassigntest" "dunecommon")
add_executable("float_cmp" float_cmp.cc)
target_link_libraries("float_cmp" "dunecommon")
add_executable("testfloatcmp" testfloatcmp.cc)
target_link_libraries("testfloatcmp" "dunecommon")
# we provide an empty fortran file to force the linker
# to link to the fortran libraries (needed for static linking)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment