Skip to content

Commit 171967d

Browse files
committed
BUG: Ensure that EbsdLib targets macOS deployment version correctly
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent 6c0e5ec commit 171967d

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,21 @@ set(EbsdLib_USE_GHC_FILESYSTEM OFF)
103103
if(APPLE)
104104
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
105105
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
106-
message(STATUS "DARWIN_VERSION ${DARWIN_VERSION}")
107106
if(DARWIN_VERSION VERSION_LESS 19)
108107
set(EbsdLib_USE_GHC_FILESYSTEM ON)
109108
endif()
110-
elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
109+
if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.15)
110+
set(EbsdLib_USE_GHC_FILESYSTEM ON)
111+
endif()
112+
endif()
113+
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
111114
set(EbsdLib_USE_GHC_FILESYSTEM ON)
112115
endif()
113-
message(STATUS "EbsdLib_USE_GHC_FILESYSTEM: ${EbsdLib_USE_GHC_FILESYSTEM}")
116+
117+
message(STATUS "EbsdLib: DARWIN_VERSION ${DARWIN_VERSION}")
118+
message(STATUS "EbsdLib: CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
119+
message(STATUS "EbsdLib: EbsdLib_USE_GHC_FILESYSTEM: ${EbsdLib_USE_GHC_FILESYSTEM}")
120+
114121
if(EbsdLib_USE_GHC_FILESYSTEM)
115122
find_package(ghcFilesystem REQUIRED NAMES ghc_filesystem ghcFilesystem)
116123
endif()

0 commit comments

Comments
 (0)