@mobrowser/native 2.15.0 → 2.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cmake/MoBrowser.cmake +12 -1
- package/package.json +1 -1
package/cmake/MoBrowser.cmake
CHANGED
|
@@ -12,7 +12,18 @@ set(DIST_DIR ${CMAKE_BINARY_DIR}/bin)
|
|
|
12
12
|
if (OS_WIN)
|
|
13
13
|
set(MOBROWSER_SDK_DIR "${PROJECT_ROOT_DIR}/node_modules/@mobrowser/sdk-win-x64")
|
|
14
14
|
elseif (OS_MAC)
|
|
15
|
-
|
|
15
|
+
# Follow the architecture being built for, not the host: the MoBrowser CLI
|
|
16
|
+
# cross-builds and passes the target through CMAKE_OSX_ARCHITECTURES.
|
|
17
|
+
if (CMAKE_OSX_ARCHITECTURES)
|
|
18
|
+
set(MOBROWSER_TARGET_ARCH "${CMAKE_OSX_ARCHITECTURES}")
|
|
19
|
+
else ()
|
|
20
|
+
set(MOBROWSER_TARGET_ARCH "${CMAKE_HOST_SYSTEM_PROCESSOR}")
|
|
21
|
+
endif ()
|
|
22
|
+
if (MOBROWSER_TARGET_ARCH MATCHES "x86_64|x64")
|
|
23
|
+
set(MOBROWSER_SDK_DIR "${PROJECT_ROOT_DIR}/node_modules/@mobrowser/sdk-darwin-x64")
|
|
24
|
+
else ()
|
|
25
|
+
set(MOBROWSER_SDK_DIR "${PROJECT_ROOT_DIR}/node_modules/@mobrowser/sdk-darwin-arm64")
|
|
26
|
+
endif ()
|
|
16
27
|
elseif (OS_LINUX)
|
|
17
28
|
set(MOBROWSER_SDK_DIR "${PROJECT_ROOT_DIR}/node_modules/@mobrowser/sdk-linux-x64")
|
|
18
29
|
endif ()
|
package/package.json
CHANGED