Fixes for macs CI

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
bensuperpc · Dec 30, 2024 · b6be2dd · b6be2dd
1 parent 226da6b
commit b6be2dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/dockcross.yml b/.github/workflows/dockcross.yml
@@ -26,8 +26,8 @@ jobs:
           - { image_name: android-x86_64, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OFF" }
 
           # Web images
-          - { image_name: web-wasm, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF" }
-          - { image_name: web-wasi, cmake_arg: "-DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} -fno-exceptions'" }
+          - { image_name: web-wasm, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OFF" }
+          - { image_name: web-wasi, cmake_arg: "-DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} -fno-exceptions' -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OFF" }
 
           # Linux ARMv5 images
           - { image_name: linux-armv5, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF" }

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
           - { image_name: android-x86_64, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OFF" }
 
           # Web images
-          - { image_name: web-wasm, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF" }
-          - { image_name: web-wasi, cmake_arg: "-DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} -fno-exceptions'" }
+          - { image_name: web-wasm, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OF" }
+          - { image_name: web-wasi, cmake_arg: "-DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} -fno-exceptions' -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF -DENABLE_THREADPOOL=OFF" }
 
           # Linux ARMv5 images
           - { image_name: linux-armv5, cmake_arg: "-DCMAKE_CXX_STANDARD=20 -DENABLE_OPENCL=OFF -DENABLE_CUDA=OFF -DENABLE_QT=OFF" }

diff --git a/cmake/install-rules.cmake b/cmake/install-rules.cmake
@@ -1,6 +1,11 @@
 install(
     TARGETS GTASA_alternative_code_exe
     RUNTIME COMPONENT GTASA_alternative_code_Runtime
+    BUNDLE DESTINATION bin
+#    LIBRARY DESTINATION lib${LIB_SUFFIX}
+#    ARCHIVE DESTINATION lib${LIB_SUFFIX}
+#    RUNTIME DESTINATION bin
+#    BUNDLE DESTINATION bin
 )
 
 if(PROJECT_IS_TOP_LEVEL)