Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Özgür Ozan Sen
ogs
Commits
cc0aa7b5
Verified
Commit
cc0aa7b5
authored
3 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Check header, fix hdf5 includes.
parent
6db84d44
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
MeshLib/CMakeLists.txt
+3
-1
3 additions, 1 deletion
MeshLib/CMakeLists.txt
ThirdParty/container-maker
+1
-1
1 addition, 1 deletion
ThirdParty/container-maker
scripts/cmake/Dependencies.cmake
+6
-6
6 additions, 6 deletions
scripts/cmake/Dependencies.cmake
with
10 additions
and
8 deletions
MeshLib/CMakeLists.txt
+
3
−
1
View file @
cc0aa7b5
...
...
@@ -43,7 +43,9 @@ target_link_libraries(
$<$<TARGET_EXISTS:petsc>:petsc>
)
target_include_directories
(
MeshLib PUBLIC
${
VTK_INCLUDE_DIRS
}
)
target_include_directories
(
MeshLib PUBLIC
${
VTK_INCLUDE_DIRS
}
${
HDF5_INCLUDE_DIRS
}
)
target_compile_definitions
(
MeshLib
...
...
This diff is collapsed.
Click to expand it.
container-maker
@
3398e78f
Compare
297085c8
...
3398e78f
Subproject commit
297085c8f782154bab0c10249f47560cbfab9941
Subproject commit
3398e78feafb6890e5c27c3e6ce5d36ce1b922b0
This diff is collapsed.
Click to expand it.
scripts/cmake/Dependencies.cmake
+
6
−
6
View file @
cc0aa7b5
...
...
@@ -122,7 +122,8 @@ CPMFindPackage(
if
(
Eigen3_ADDED
)
add_library
(
Eigen3::Eigen INTERFACE IMPORTED
)
target_include_directories
(
Eigen3::Eigen SYSTEM INTERFACE
${
Eigen3_SOURCE_DIR
}
${
OpenMP_CXX_INCLUDE_DIRS
}
Eigen3::Eigen SYSTEM INTERFACE
${
Eigen3_SOURCE_DIR
}
${
OpenMP_CXX_INCLUDE_DIRS
}
)
endif
()
...
...
@@ -220,11 +221,10 @@ else()
if
(
ZLIB_ADDED
)
list
(
APPEND HDF5_LIBRARIES zlibstatic
)
endif
()
set
(
HDF5_C_INCLUDE_DIR
${
HDF5_SOURCE_DIR
}
/src
)
set
(
HDF5_INCLUDE_DIR
${
HDF5_SOURCE_DIR
}
/src
)
target_include_directories
(
hdf5-static INTERFACE
${
HDF5_BINARY_DIR
}
${
HDF5_INCLUDE_DIR
}
)
set
(
HDF5_INCLUDE_DIRS
${
HDF5_SOURCE_DIR
}
/src
${
HDF5_BINARY_DIR
}
)
set
(
HDF5_C_INCLUDE_DIRS
${
HDF5_INCLUDE_DIRS
}
)
set
(
HDF5_C_INCLUDE_DIR
${
HDF5_INCLUDE_DIRS
}
)
target_include_directories
(
hdf5-static INTERFACE
${
HDF5_INCLUDE_DIRS
}
)
else
()
find_package
(
HDF5 REQUIRED
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment