Skip to content

Commit

Permalink
Merge pull request #1185 from NREL/SAM_1745
Browse files Browse the repository at this point in the history
Update to minimum MacOS version 12 per SAM #1745
  • Loading branch information
sjanzou authored Jul 23, 2024
2 parents 6e84b18 + 577c143 commit 5998815
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ option(SAMAPI_EXPORT "Export of ssc binaries to the SAM_api directory; for Unix,
#

if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
endif()

if (UNIX AND NOT CMAKE_C_COMPILER)
Expand Down Expand Up @@ -102,7 +102,7 @@ function(set_default_compile_options target)
endif()
endif()
if (SAMAPI_EXPORT AND APPLE)
SET(MAIN_CFLAGS "${MAIN_CFLAGS} -mmacosx-version-min=10.15" )
SET(MAIN_CFLAGS "${MAIN_CFLAGS} -mmacosx-version-min=12" )
endif()
set_target_properties(${target} PROPERTIES COMPILE_FLAGS ${MAIN_CFLAGS})
endfunction()
Expand Down
2 changes: 1 addition & 1 deletion solarpilot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set(CMAKE_VERBOSE_MAKEFILE ON)

if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
endif()


Expand Down
2 changes: 1 addition & 1 deletion ssc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ if(UNIX)
set_property(TARGET ssc PROPERTY PREFIX "lib")
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
if (APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.15")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=12")
add_custom_command(
TARGET ssc
POST_BUILD
Expand Down

0 comments on commit 5998815

Please sign in to comment.