Skip to content
Snippets Groups Projects
Commit fd64809c authored by Thomas Fetzer's avatar Thomas Fetzer
Browse files

[installJambhekar2015b.sh] Fix issues related to dune.grid (add patch), fix finding ug

parent 07ec3d34
Branches master
No related tags found
No related merge requests found
......@@ -18,6 +18,7 @@ missing
stamp-h1
config.*
configure
dunecontrol_used.opts
# auto-generated doxygen files
Doxyfile
......
......@@ -55,6 +55,9 @@ cd ug && git checkout -q v3.12.1 && cd ..
cd dumux && git checkout -q 12dcfef8b71dbc8be815df7e8148d9eba7e45c74 && cd ..
### apply necessary patches
cd dune-grid && patch -p1 < ../Jambhekar2015b/patches/dune-grid.patch && cd ..
### build UG
cd ug
autoreconf -is
......@@ -68,4 +71,9 @@ make install
cd ..
### run dunecontrol
UG_ROOT=$SCRIPTPATH/../ug ./dune-common/bin/dunecontrol --opts=Jambhekar2015b/dunecontrol.opts all
pwd > temp.txt
sed -i 's/\//\\\//g' temp.txt
EXTPATH=`cat temp.txt`
/usr/bin/rm temp.txt
sed "s/DUG_ROOT=.*/DUG_ROOT=$EXTPATH\/ug/" Jambhekar2015b/dunecontrol.opts > Jambhekar2015b/dunecontrol_used.opts
./dune-common/bin/dunecontrol --opts=Jambhekar2015b/dunecontrol_used.opts all
diff --git a/cmake/modules/FindGrape.cmake b/cmake/modules/FindGrape.cmake
index d622152..80d54a7 100644
--- a/cmake/modules/FindGrape.cmake
+++ b/cmake/modules/FindGrape.cmake
@@ -43,6 +43,7 @@ find_path(GRAPE_INCLUDE_DIR grape.h
# check header usability
include(CMakePushCheckState)
+include(CheckIncludeFiles)
cmake_push_check_state()
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DENABLE_GRAPE")
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR} ${GRAPE_INCLUDE_DIR})
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