Skip to content

Commit cd431fa

Browse files
committed
Removed cmake_push_check_state
1 parent 9d951c9 commit cd431fa

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

cmake/recipes/filesystem.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ FetchContent_MakeAvailable(filesystem)
1515
add_library(ghc::filesystem ALIAS ghc_filesystem)
1616

1717
# Check if we need to link against any special libraries (e.g., stdc++fs for GCC < 9)
18-
cmake_push_check_state()
18+
set(SAVED_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
19+
set(SAVED_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
1920

2021
set(GHC_FILESYSTEM_TEST_CODE [[
2122
#include <ghc/fs_std.hpp>
@@ -27,20 +28,17 @@ set(GHC_FILESYSTEM_TEST_CODE [[
2728

2829

2930
# Try to compile a simple filesystem program without any linker flags
30-
set(CMAKE_REQUIRED_QUIET ON)
3131
list(APPEND CMAKE_REQUIRED_INCLUDES "${filesystem_SOURCE_DIR}/include")
3232
check_cxx_source_compiles("${GHC_FILESYSTEM_TEST_CODE}" GHC_FILESYSTEM_NO_LINK_NEEDED)
3333

3434
if(NOT GHC_FILESYSTEM_NO_LINK_NEEDED)
35-
set(PREV_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
36-
3735
# Add the libstdc++ flag
38-
set(CMAKE_REQUIRED_LIBRARIES ${PREV_LIBRARIES} -lstdc++fs)
36+
set(CMAKE_REQUIRED_LIBRARIES ${SAVED_CMAKE_REQUIRED_LIBRARIES} -lstdc++fs)
3937
check_cxx_source_compiles("${GHC_FILESYSTEM_TEST_CODE}" GHC_FILESYSTEM_STDCPPFS_NEEDED)
4038

4139
if(NOT GHC_FILESYSTEM_STDCPPFS_NEEDED)
4240
# Try the libc++ flag
43-
set(CMAKE_REQUIRED_LIBRARIES ${PREV_LIBRARIES} -lc++fs)
41+
set(CMAKE_REQUIRED_LIBRARIES ${SAVED_CMAKE_REQUIRED_LIBRARIES} -lc++fs)
4442
check_cxx_source_compiles("${GHC_FILESYSTEM_TEST_CODE}" GHC_FILESYSTEM_CPPFS_NEEDED)
4543
endif()
4644
endif()
@@ -61,4 +59,5 @@ else()
6159
message(FATAL_ERROR "Unable to determine correct linking options to compile GHC filesystem!")
6260
endif()
6361

64-
cmake_pop_check_state()
62+
set(CMAKE_REQUIRED_INCLUDES ${SAVED_CMAKE_REQUIRED_INCLUDES})
63+
set(CMAKE_REQUIRED_LIBRARIES ${SAVED_CMAKE_REQUIRED_LIBRARIES})

0 commit comments

Comments
 (0)