Skip to content

umpire: skip std::filesystem if using old gcc #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 7, 2021
Merged

umpire: skip std::filesystem if using old gcc #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390b3dd
typo
evaleev Sep 6, 2021
5492a19
avoid use of std::filesystem by Umpire with gcc pre-9
evaleev Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ if (ENABLE_WFN91_LINALG_DISCOVERY_KIT)
else(ENABLE_SCALAPACK)
find_package(LAPACK REQUIRED)
# Propagate LAPACK -> BLAS if not set
# (LAPACK necessacarily contains a BLAS linker by standard)
# (LAPACK necessarily contains a BLAS linker by standard)
# TODO: Tell David to write a macro that hides this verbosity from user space
if( NOT BLAS_LIBRARIES )
set( BLAS_LIBRARIES "${LAPACK_LIBRARIES}" CACHE STRING "BLAS LIBRARIES" )
Expand Down
7 changes: 7 additions & 0 deletions cmake/modules/FindOrFetchUmpire.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ endif (NOT TARGET umpire)
# if not found, build via FetchContent
if (NOT TARGET umpire)

# caveat: on recent Ubuntu default libstdc++ provides filesystem, but if using older gcc (gcc-8) must link against
# libstdc++fs: https://bugs.launchpad.net/ubuntu/+source/gcc-8/+bug/1824721 ... skip the use of std::filesystem altogether with pre-9 gcc!!!
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
# disable by populating cache with compile test result variable
set(UMPIRE_ENABLE_FILESYSTEM OFF CACHE BOOL "Whether Umpire to use std::filesystem")
endif()

include(FetchContent)
FetchContent_Declare(
umpire
Expand Down
9 changes: 9 additions & 0 deletions external/umpire.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ else()
-DENABLE_LOGGING=OFF
-DENABLE_ASSERTS=${enable_umpire_asserts}
)

# caveat: on recent Ubuntu default libstdc++ provides filesystem, but if using older gcc (gcc-8) must link against
# libstdc++fs: https://bugs.launchpad.net/ubuntu/+source/gcc-8/+bug/1824721 ... skip the use of std::filesystem altogether with pre-9 gcc!!!
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
# disable by populating cache with compile test result variable
list(APPEND UMPIRE_CMAKE_ARGS
-DUMPIRE_ENABLE_FILESYSTEM=OFF)
endif()

if (ENABLE_CUDA)
list(APPEND UMPIRE_CMAKE_ARGS
-DENABLE_CUDA=ON
Expand Down