update cmake flag

kulukami · Aug 22, 2023 · b426ce8 · b426ce8
1 parent 93c8ac4
commit b426ce8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/build_script/libclamav_linux_vcpkg_arm64.sh b/build_script/libclamav_linux_vcpkg_arm64.sh
@@ -32,6 +32,7 @@ cmake .. \
   -D VCPKG_TARGET_TRIPLET="$VCPKG_DEFAULT_TRIPLET"                       \
   -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH"                            \
   -D RUST_COMPILER_TARGET="$RUSTC_TARGET"                                \
+  -D CMAKE_GENERATOR_PLATFORM="arm64"                                    \
   -D ENABLE_TESTS=OFF                                                    \
   -D ENABLE_STATIC_LIB=ON                                                \
   -D ENABLE_LIBCLAMAV_ONLY=ON                                            \

diff --git a/build_script/libclamav_osx_vcpkg_arm64.sh b/build_script/libclamav_osx_vcpkg_arm64.sh
@@ -30,9 +30,10 @@ cmake .. \
   -D CMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
   -D VCPKG_TARGET_TRIPLET="$VCPKG_DEFAULT_TRIPLET"                       \
   -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH"                            \
-  -D CMAKE_SYSTEM_NAME=Darwin                                            \
-  -D CMAKE_OSX_ARCHITECTURES="$TARGET_ARCH"                              \
   -D RUST_COMPILER_TARGET="$RUSTC_TARGET"                                \
+  -D CMAKE_SYSTEM_NAME=Darwin                                            \
+  -D CMAKE_OSX_ARCHITECTURES="arm64"                                     \
+  -D CMAKE_GENERATOR_PLATFORM="arm64"                                    \
   -D ENABLE_TESTS=OFF                                                    \
   -D ENABLE_STATIC_LIB=ON                                                \
   -D ENABLE_LIBCLAMAV_ONLY=ON                                            \

diff --git a/build_script/libclamav_osx_vcpkg_x64.sh b/build_script/libclamav_osx_vcpkg_x64.sh
@@ -32,7 +32,8 @@ cmake .. \
   -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH"                            \
   -D RUST_COMPILER_TARGET="$RUSTC_TARGET"                                \
   -D CMAKE_SYSTEM_NAME=Darwin                                            \
-  -D CMAKE_OSX_ARCHITECTURES="$TARGET_ARCH"                              \
+  -D CMAKE_OSX_ARCHITECTURES="x86_64"                                    \
+  -D CMAKE_GENERATOR_PLATFORM="x86_64"                                   \
   -D ENABLE_TESTS=OFF                                                    \
   -D ENABLE_STATIC_LIB=ON                                                \
   -D ENABLE_LIBCLAMAV_ONLY=ON                                            \

diff --git a/build_script/libclamav_win_vcpkg_arm64.ps1 b/build_script/libclamav_win_vcpkg_arm64.ps1
@@ -32,6 +32,7 @@ cmake .. `
   -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH"                            `
   -D RUST_COMPILER_TARGET="$RUSTC_TARGET"                                `
   -D CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded                            `
+  -D CMAKE_GENERATOR_PLATFORM="arm64"                                    `
   -D ENABLE_TESTS=OFF                                                    `
   -D ENABLE_STATIC_LIB=ON                                                `
   -D ENABLE_LIBCLAMAV_ONLY=ON                                            `