Skip to content

Commit 5de83fe

Browse files
committed
fix: change macos deployment target to link with v8, and do not build framework when building macos runtime CLI
1 parent a29bc7a commit 5de83fe

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

NativeScript/CMakeLists.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ elseif(TARGET_PLATFORM STREQUAL "ios-sim")
4545
set(TARGET_PLATFORM_SPEC "ios-arm64_x86_64-simulator")
4646

4747
elseif(TARGET_PLATFORM STREQUAL "macos")
48-
set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "13.0")
49-
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
48+
set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "13.3")
49+
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.3")
5050
set(LIBFFI_BUILD "macosx-universal")
5151
set(TARGET_PLATFORM_MACOS TRUE)
5252
set(SDK_NAME "macosx")
53-
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
53+
set(CMAKE_OSX_ARCHITECTURES "arm64")
5454
set(TARGET_PLATFORM_SPEC "macos-arm64_x86_64")
5555
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_PLATFORM_MACOS")
5656

@@ -267,6 +267,7 @@ message(STATUS "SDK = ${CMAKE_OSX_SYSROOT}")
267267
# Build targets
268268
if(BUILD_CLI_BINARY)
269269
add_executable(${NAME} ${SOURCE_FILES})
270+
set(BUILD_FRAMEWORK FALSE)
270271
else()
271272
add_library(
272273
${NAME}
@@ -305,9 +306,11 @@ if(TARGET_PLATFORM_MACOS)
305306

306307
# Convert the Info.plist from binary format to XML format.
307308
# This seemed to unblock a build error when using in React Native.
308-
add_custom_command(TARGET ${NAME} POST_BUILD
309-
COMMAND plutil -convert xml1 $<TARGET_FILE_DIR:${NAME}>/Resources/Info.plist
310-
)
309+
if (BUILD_FRAMEWORK)
310+
add_custom_command(TARGET ${NAME} POST_BUILD
311+
COMMAND plutil -convert xml1 $<TARGET_FILE_DIR:${NAME}>/Resources/Info.plist
312+
)
313+
endif()
311314
set(METADATA_FILE "metadata.macos.nsmd")
312315
elseif(TARGET_PLATFORM_IOS)
313316
# Convert the Info.plist from binary format to XML format.

0 commit comments

Comments
 (0)