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
e063ea80
Verified
Commit
e063ea80
authored
2 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Fixed rpaths for hdf5 and vtk via external deps.
parent
5f0f290f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/cmake/DependenciesExternalProject.cmake
+3
-1
3 additions, 1 deletion
scripts/cmake/DependenciesExternalProject.cmake
with
3 additions
and
1 deletion
scripts/cmake/DependenciesExternalProject.cmake
+
3
−
1
View file @
e063ea80
...
@@ -288,6 +288,7 @@ if(NOT HDF5_FOUND)
...
@@ -288,6 +288,7 @@ if(NOT HDF5_FOUND)
STATUS
STATUS
"ExternalProject_Add(): added package HDF5@
${
ogs.tested_version.hdf5
}
"
"ExternalProject_Add(): added package HDF5@
${
ogs.tested_version.hdf5
}
"
)
)
set
(
_EXT_LIBS
${
_EXT_LIBS
}
HDF5 CACHE INTERNAL
""
)
BuildExternalProject_find_package
(
HDF5
)
BuildExternalProject_find_package
(
HDF5
)
endif
()
endif
()
...
@@ -366,12 +367,13 @@ if(NOT VTK_FOUND)
...
@@ -366,12 +367,13 @@ if(NOT VTK_FOUND)
STATUS
STATUS
"ExternalProject_Add(): added package VTK@
${
ogs.minimum_version.vtk
}
"
"ExternalProject_Add(): added package VTK@
${
ogs.minimum_version.vtk
}
"
)
)
set
(
_EXT_LIBS
${
_EXT_LIBS
}
VTK CACHE INTERNAL
""
)
BuildExternalProject_find_package
(
VTK
)
BuildExternalProject_find_package
(
VTK
)
endif
()
endif
()
# append RPATHs
# append RPATHs
foreach
(
lib
${
_EXT_LIBS
}
)
foreach
(
lib
${
_EXT_LIBS
}
)
set
(
CMAKE_BUILD_RPATH
${
CMAKE_BUILD_RPATH
}
${
build_dir_
${
lib
}}
/lib
set
(
CMAKE_BUILD_RPATH
${
CMAKE_BUILD_RPATH
}
${
build_dir_
${
lib
}}
/lib
{build_dir_
${
lib
}
}/lib64
$
{
build_dir_
${
lib
}}
/lib64
)
)
endforeach
()
endforeach
()
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