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
54
Issues
54
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
cc066e10
Commit
cc066e10
authored
Apr 12, 2019
by
Daniel Wortmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tried to fix issues with hdf5
parent
74ba8a11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
cmake/tests/test_HDF5.cmake
cmake/tests/test_HDF5.cmake
+1
-1
cmake/tests/test_juDFT.cmake
cmake/tests/test_juDFT.cmake
+3
-0
juDFT/CMakeLists.txt
juDFT/CMakeLists.txt
+5
-1
No files found.
cmake/tests/test_HDF5.cmake
View file @
cc066e10
...
...
@@ -62,7 +62,7 @@ if (DEFINED CLI_FLEUR_USE_HDF5)
add_subdirectory
(
external/hdf5-git EXCLUDE_FROM_ALL
)
set
(
FLEUR_USE_HDF5 TRUE
)
set
(
FLEUR_USE_HDF5MPI FLEUR_USE_MPI
)
set
(
FLEUR_
LIBRARIES
"
${
FLEUR_LIBRARIES
}
;hdf5_fortran-static"
)
set
(
FLEUR_
COMPILE_HDF true
)
include_directories
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
/modules/hdf5/static"
)
endif
()
else
()
...
...
cmake/tests/test_juDFT.cmake
View file @
cc066e10
...
...
@@ -9,6 +9,9 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/juDFT/CMakeLists.txt" )
endif
()
set
(
JUDFT_USE_MPI
${
FLEUR_USE_MPI
}
CACHE BOOL
"Compile with MPI, will also work in serial"
)
set
(
JUDFT_USE_HDF5
${
FLEUR_USE_HDF5
}
CACHE BOOL
"Compile with HDF5"
)
if
(
DEFINED FLEUR_COMPILE_HDF
)
set
(
JUDFT_COMPILE_HDF ON CHACHE BOOL
"The HDF5 is compiled as submodule"
)
endif
()
if
(
DEFINED FLEUR_USE_HDF5MPI
)
set
(
JUDFT_USE_HDF5MPI FLEUR_USE_HDF5MPI CACHE BOOL
"Is the HDF5 version able to do parallel IO"
)
endif
()
...
...
juDFT/CMakeLists.txt
View file @
cc066e10
...
...
@@ -7,6 +7,7 @@ option(JUDFT_USE_HDF5 "Compile HDF5 tools" OFF)
option
(
JUDFT_USE_HDF5MPI
"Is the HDF5 version able to do parallel IO"
OFF
)
option
(
JUDFT_USE_COLLECT
"Collect usage data"
ON
)
option
(
JUDFT_USE_DEBUG
"Set CPP_DEBUG when compiling code"
OFF
)
option
(
JUDFT_COMPILE_HDF
"HDF5 is compiled as submodule"
OFF
)
#In addition you might want to set
#set(JUDFT_LIBRARIES "-lsomething")
#set(JUFDT_COMPILEOPTS "-r8")
...
...
@@ -45,7 +46,10 @@ if (JUDFT_USE_MPI)
endif
()
if
(
JUDFT_USE_HDF5
)
target_compile_definitions
(
juDFT PUBLIC CPP_HDF
)
target_link_libraries
(
juDFT
"hdf5_fortran;hdf5"
)
target_link_libraries
(
juDFT hdf5_fortran hdf5
)
if
(
JUDFT_COMPILE_HDF
)
add_dependencies
(
juDFT hdf5_fortran-static
)
endif
()
endif
()
if
(
JUDFT_USE_HDF5MPI
)
target_compile_definitions
(
juDFT PUBLIC CPP_HDFMPI
)
...
...
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