Skip to content

Commit

Permalink
Remove extra macOS detection code.
Browse files Browse the repository at this point in the history
Remove CMAKE_OSX_DEPLOYMENT_TARGET force setting from SDK file.

Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
imikejackson committed Nov 18, 2022
1 parent 51f063d commit cfb1234
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@ if(APPLE)
message(STATUS "Found macOS ${OSX_DEPLOYMENT_TARGET} ${MACOS_NAME} as the host. Darwin Version:${DARWIN_VERSION}")
ENDIF ()

IF (DARWIN_VERSION EQUAL 21) # macOS 12.00 Monterey (Xcode 13.x)
message(STATUS "Found macOS 12.00 Monterey as the host. Darwin Version:${DARWIN_VERSION}")
set(OSX_DEPLOYMENT_TARGET "12.00")
ENDIF ()


if("${OSX_SDK}" STREQUAL "NOT-FOUND")
message(FATAL_ERROR "This version of macOS (${DARWIN_VERSION}) is not recognized.\
The following versions are supported:\n\
Expand Down
2 changes: 1 addition & 1 deletion projects/apple/OSX_EMsoft_SDK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(NOT DEFINED EMsoft_FIRST_CONFIGURE)
endif()

# Set our Deployment Target to match Qt
set(CMAKE_OSX_DEPLOYMENT_TARGET "@OSX_DEPLOYMENT_TARGET@" CACHE STRING "" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "@OSX_DEPLOYMENT_TARGET@")
set(CMAKE_OSX_SYSROOT "@OSX_SDK@" CACHE STRING "" FORCE)
endif()

Expand Down

0 comments on commit cfb1234

Please sign in to comment.