Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hyteg
hyteg
Commits
37f633b8
Commit
37f633b8
authored
Sep 10, 2021
by
Marcel Koch
Browse files
fix finding rapidjson & rm
parent
12fb773e
Pipeline
#34214
failed with stages
in 15 minutes and 28 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
37f633b8
...
...
@@ -49,10 +49,26 @@ if ( HYTEG_BUILD_WITH_TRILINOS )
endif
()
if
(
HYTEG_BUILD_WITH_GINKGO
)
find_package
(
Ginkgo REQUIRED
)
find_package
(
RapidJSON REQUIRED
)
find_package
(
Ginkgo REQUIRED
)
find_package
(
RapidJSON QUIET
)
if
(
NOT RapidJSON_FOUND
)
include
(
FetchContent
)
FetchContent_Declare
(
rapidjson
GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
GIT_TAG 48fbd8cd202ca54031fe799db2ad44ffa8e77c13
)
FetchContent_GetProperties
(
rapidjson
)
if
(
NOT rapidjson_POPULATED
)
FetchContent_Populate
(
rapidjson
)
endif
()
set
(
RapidJSON_INCLUDE_DIR
"
${
rapidjson_SOURCE_DIR
}
/include"
)
add_library
(
rapidjson INTERFACE
)
set_target_properties
(
rapidjson PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
"
${
RapidJSON_INCLUDE_DIR
}
"
)
endif
()
message
(
STATUS
"Found Ginkgo! Ginkgo_DIR =
${
Ginkgo_DIR
}
"
)
list
(
APPEND SERVICE_LIBS Ginkgo::ginkgo rapidjson
)
include_directories
(
${
Ginkgo_RM_DIR
}
)
list
(
APPEND SERVICE_LIBS Ginkgo::ginkgo rapidjson
)
endif
()
find_package
(
waLBerla
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment