Skip to content

Commit 6c0e5ec

Browse files
committed
Fix detection of ghc_filesystem on macOS systems
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent b177e78 commit 6c0e5ec

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,18 @@ endif()
9999
# Determine if we need the ghcFilesystem library
100100
#-------------------------------------------------------------------------------
101101
set(EbsdLib_USE_GHC_FILESYSTEM OFF)
102-
if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
103-
set(EbsdLib_USE_GHC_FILESYSTEM OFF)
104-
elseif(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.15)
105-
set(EbsdLib_USE_GHC_FILESYSTEM ON)
106-
if("${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "")
107-
message(WARNING "CMAKE_OSX_DEPLOYMENT_TARGET is empty. Assuming macOS deployment *OLDER* than 10.15 Catalina. This will require ghcFilesystem library.")
102+
103+
if(APPLE)
104+
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
105+
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
106+
message(STATUS "DARWIN_VERSION ${DARWIN_VERSION}")
107+
if(DARWIN_VERSION VERSION_LESS 19)
108+
set(EbsdLib_USE_GHC_FILESYSTEM ON)
108109
endif()
109110
elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
110111
set(EbsdLib_USE_GHC_FILESYSTEM ON)
111112
endif()
112-
113+
message(STATUS "EbsdLib_USE_GHC_FILESYSTEM: ${EbsdLib_USE_GHC_FILESYSTEM}")
113114
if(EbsdLib_USE_GHC_FILESYSTEM)
114115
find_package(ghcFilesystem REQUIRED NAMES ghc_filesystem ghcFilesystem)
115116
endif()

0 commit comments

Comments
 (0)