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
yezhigangzju
ogs
Commits
14aaa12e
Verified
Commit
14aaa12e
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Rename xdmf libs to avoid clash with vtk xdmf.
parent
34c35474
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
MeshLib/CMakeLists.txt
+1
-1
1 addition, 1 deletion
MeshLib/CMakeLists.txt
Tests/xdmfdiff/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Tests/xdmfdiff/CMakeLists.txt
ThirdParty/CMakeLists.txt
+14
-4
14 additions, 4 deletions
ThirdParty/CMakeLists.txt
ThirdParty/xdmf
+1
-1
1 addition, 1 deletion
ThirdParty/xdmf
with
17 additions
and
7 deletions
MeshLib/CMakeLists.txt
+
1
−
1
View file @
14aaa12e
...
...
@@ -26,7 +26,7 @@ ogs_add_library(MeshLib ${SOURCES})
target_link_libraries
(
MeshLib
PUBLIC BaseLib GeoLib GitInfoLib MathLib
${
VTK_LIBRARIES
}
Xdmf
PUBLIC BaseLib GeoLib GitInfoLib MathLib
${
VTK_LIBRARIES
}
Ogs
Xdmf
PRIVATE spdlog::spdlog
)
if
(
OGS_USE_MPI AND TARGET MPI::MPI_CXX
)
...
...
This diff is collapsed.
Click to expand it.
Tests/xdmfdiff/CMakeLists.txt
+
1
−
1
View file @
14aaa12e
add_executable
(
xdmfdiff xdmfdiff.cpp
)
target_link_libraries
(
xdmfdiff Xdmf std::filesystem
)
target_link_libraries
(
xdmfdiff
Ogs
Xdmf std::filesystem
)
install
(
PROGRAMS $<TARGET_FILE:xdmfdiff> DESTINATION bin COMPONENT ogs_extras
)
This diff is collapsed.
Click to expand it.
ThirdParty/CMakeLists.txt
+
14
−
4
View file @
14aaa12e
...
...
@@ -95,18 +95,28 @@ foreach(TARGET ${DISABLE_WARNINGS_TARGETS})
endforeach
()
find_package
(
ZLIB REQUIRED
)
# ZLIB is a HDF5 dependency
set
(
XDMF_LIBNAME OgsXdmf CACHE INTERNAL
""
)
add_subdirectory
(
xdmf
)
target_include_directories
(
Xdmf
PUBLIC
target_include_directories
(
${
XDMF_LIBNAME
}
PUBLIC
${
PROJECT_SOURCE_DIR
}
/ThirdParty/xdmf
${
PROJECT_BINARY_DIR
}
/ThirdParty/xdmf
)
if
(
OGS_USE_CONAN AND UNIX AND APPLE
)
find_package
(
Iconv REQUIRED
)
endif
()
target_link_libraries
(
Xdmf
Boost::boost
${
Iconv_LIBRARIES
}
ZLIB::ZLIB
)
target_include_directories
(
Xdmf
Core PUBLIC
target_link_libraries
(
${
XDMF_LIBNAME
}
Boost::boost
${
Iconv_LIBRARIES
}
ZLIB::ZLIB
)
target_include_directories
(
${
XDMF_LIBNAME
}
Core PUBLIC
${
PROJECT_SOURCE_DIR
}
/ThirdParty/xdmf/core
${
PROJECT_BINARY_DIR
}
/ThirdParty/xdmf/core
)
find_package
(
LibXml2 REQUIRED
)
# LibXml2 is a XdmfCore dependency
target_link_libraries
(
XdmfCore PUBLIC LibXml2::LibXml2
)
target_link_libraries
(
${
XDMF_LIBNAME
}
Core PUBLIC LibXml2::LibXml2
)
set_target_properties
(
${
XDMF_LIBNAME
}
${
XDMF_LIBNAME
}
Core PROPERTIES
RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/
${
CMAKE_INSTALL_BINDIR
}
LIBRARY_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/
${
CMAKE_INSTALL_LIBDIR
}
)
if
(
BUILD_SHARED_LIBS
)
install
(
TARGETS
${
XDMF_LIBNAME
}
${
XDMF_LIBNAME
}
Core LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
This diff is collapsed.
Click to expand it.
xdmf
@
79807fd0
Compare
2b47639b
...
79807fd0
Subproject commit
2b47639bd296d2e77443c34bcda700cbb388ec72
Subproject commit
79807fd005f3ce7e59c805e6c2382b81915998a1
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