Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
fleur
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
52
Issues
52
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
fleur
fleur
Commits
47583276
Commit
47583276
authored
Jun 15, 2018
by
Daniel Wortmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some small bugfixes in configure script
parent
869a13a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
cmake/machines/IFF.sh
cmake/machines/IFF.sh
+2
-2
cmake/store_environment.sh
cmake/store_environment.sh
+4
-4
external/hdf5/install_hdf5.sh
external/hdf5/install_hdf5.sh
+5
-2
No files found.
cmake/machines/IFF.sh
View file @
47583276
FC
=
mpiifort
FLEUR_LIBRARIES
=
"-lxml2;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64;-mt_mpi"
FC
=
${
FC
:
=mpiifort
}
FLEUR_LIBRARIES
=
"-lxml2;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64;-mt_mpi
;
${
FLEUR_LIBRARIES
}
"
cmake/store_environment.sh
View file @
47583276
...
...
@@ -16,7 +16,7 @@ if [ "$CLI_LIBRARIES" ]
then
if
[
"cmake_lib"
]
then
cmake_lib
=
"
$CLI_LIBRARIES
:
$cmake_lib
"
cmake_lib
=
"
$CLI_LIBRARIES
;
$cmake_lib
"
else
cmake_lib
=
"
$CLI_LIBRARIES
"
fi
...
...
@@ -26,7 +26,7 @@ for lib in $FLEUR_LIBDIR $CLI_LIBDIR
do
if
[
"cmake_lib"
]
then
cmake_lib
=
"-L
$lib
:
$cmake_lib
"
cmake_lib
=
"-L
$lib
;
$cmake_lib
"
else
cmake_lib
=
"-L
$lib
"
fi
...
...
@@ -45,11 +45,11 @@ then
fi
if
[
"
$CLI_FLAGS
"
]
then
cmake_flags
=
"
$CMAKE_Fortran_FLAGS
cmake_flags"
cmake_flags
=
"
$CMAKE_Fortran_FLAGS
$
cmake_flags
"
fi
for
lib
in
$FLEUR_INCLUDEDIR
$CLI_INCLUDEDIR
do
cmake_flags
=
"-I
$lib
cmake_flags"
cmake_flags
=
"-I
$lib
$
cmake_flags
"
done
echo
"set(CMAKE_Fortran_FLAGS
\"
$cmake_flags
\"
)"
>>
config.cmake
...
...
external/hdf5/install_hdf5.sh
View file @
47583276
...
...
@@ -12,7 +12,10 @@ then
#Do make install
cd
build
make
install
cd
..
else
cd
CMake-hdf5-
${
hdf5_version
}
fi
#Store the installation location
FLEUR_LIBDIR
=
"
$PWD
/HDF
5/
$hdf_version
/lib
$FLEUR_LIBDIR
"
FLEUR_INCLUDEDIR
=
"
$PWD
/HDF
5/
$hdf_version
/include/static
$FLEUR_INCLUDEDIR
"
FLEUR_LIBDIR
=
"
$PWD
/HDF
_Group/HDF5/
${
hdf5_version
}
/lib
$FLEUR_LIBDIR
"
FLEUR_INCLUDEDIR
=
"
$PWD
/HDF
_Group/HDF5/
${
hdf5_version
}
/include/static
$FLEUR_INCLUDEDIR
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment