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
waLBerla
waLBerla
Commits
fd01f6c9
Commit
fd01f6c9
authored
May 17, 2021
by
Michael Kuron
Browse files
Merge branch 'thoennes/cmake-fixes' into 'master'
Minor cmake fixes See merge request
!452
parents
01480896
0eddf3f0
Pipeline
#32166
passed with stages
in 511 minutes and 59 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
fd01f6c9
...
...
@@ -478,7 +478,7 @@ try_compile( WALBERLA_USE_STD_FILESYSTEM "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_
COMPILE_DEFINITIONS -DWALBERLA_USE_STD_FILESYSTEM COPY_FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/TestStdFilesystem"
)
if
(
WALBERLA_USE_STD_FILESYSTEM
)
# detect https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050 by checking whether it segfaults
execute_process
(
COMMAND
"
${
CMAKE_CURRENT_BINARY_DIR
}
/TestStdFilesystem"
RESULT_VARIABLE WALBERLA_STD_FILESYSTEM_WORKS
)
execute_process
(
COMMAND
"
${
CMAKE_CURRENT_BINARY_DIR
}
/TestStdFilesystem"
OUTPUT_QUIET
RESULT_VARIABLE WALBERLA_STD_FILESYSTEM_WORKS
)
endif
()
if
(
WALBERLA_USE_STD_FILESYSTEM AND WALBERLA_STD_FILESYSTEM_WORKS EQUAL 0
)
message
(
STATUS
"Found std::filesystem"
)
...
...
cmake/FindOpenMesh.cmake
View file @
fd01f6c9
...
...
@@ -53,7 +53,7 @@
#
#===========================================================================
cmake_minimum_required
(
VERSION 2.8.
9
)
cmake_minimum_required
(
VERSION 2.8.
12
)
#if already found via finder or simulated finder in openmesh CMakeLists.txt, skip the search
IF
(
NOT OPENMESH_FOUND
)
...
...
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