Use LLVM in CI

pierr3 · Jan 17, 2024 · 0338df1 · 0338df1
1 parent de9132c
commit 0338df1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,6 @@ concurrency:
 
 env:
   BUILD_TYPE: Release
-  VECTOR_SECRET: Dev
 
 jobs:
   build-linux:
@@ -29,7 +28,7 @@ jobs:
           sudo apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev libxcursor-dev freeglut3-dev
       - name: Configure cmake
         run: |
-          cmake -S . -B build/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DVECTOR_SECRET=${{ env.VECTOR_SECRET }}
+          cmake -S . -B build/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
       - name: Build cmake
         run: |
           cmake --build build/
@@ -41,10 +40,11 @@ jobs:
           submodules: recursive
       - name: Install native dependencies
         run: |
-          brew install pkg-config
+          brew install pkg-config llvm
+          brew link llvm
       - name: Configure cmake (intel)
         run: |
-          cmake -S . -B build_intel/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DVCPKG_TARGET_TRIPLET=x64-osx -DVECTOR_SECRET=${{ env.VECTOR_SECRET }}
+          cmake -S . -B build_intel/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DVCPKG_TARGET_TRIPLET=x64-osx
       - name: Build cmake (intel)
         run: |
           cmake --build build_intel/
@@ -56,10 +56,11 @@ jobs:
           submodules: recursive
       - name: Install native dependencies
         run: |
-          brew install pkg-config
+          brew install pkg-config llvm
+          brew link llvm
       - name: Configure cmake (arm64)
         run: |
-          cmake -S . -B build_arm64/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=arm64 -DVCPKG_TARGET_TRIPLET=arm64-osx -DVECTOR_SECRET=${{ env.VECTOR_SECRET }}
+          cmake -S . -B build_arm64/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=arm64 -DVCPKG_TARGET_TRIPLET=arm64-osx
       - name: Build cmake (arm64)
         run: |
           cmake --build build_arm64/
@@ -71,7 +72,7 @@ jobs:
           submodules: recursive
       - name: Configure cmake
         run: |
-          cmake -S . -B build/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DVCPKG_TARGET_TRIPLET=x64-windows -DVECTOR_SECRET=${{ env.VECTOR_SECRET }}
+          cmake -S . -B build/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DVCPKG_TARGET_TRIPLET=x64-windows
       - name: Build cmake
         run: |
           cmake --build build/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -129,7 +129,8 @@ jobs:
           p12-password: ${{ secrets.APPLE_CERT_PASSWORD }}
       - name: Install native dependencies
         run: |
-          brew install pkg-config
+          brew install pkg-config llvm
+          brew link llvm
       - name: Run build script
         run: |
           ./manual_osx_build.sh 1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,18 +97,18 @@ add_executable(vector_audio ${GUI_TYPE} src/main.cpp
                 ${CMAKE_SOURCE_DIR}/extern/imgui/imgui-SFML.cpp
                 ${CMAKE_SOURCE_DIR}/extern/imgui/imgui_demo.cpp
                 ${CMAKE_SOURCE_DIR}/extern/imgui/imgui_stdlib.cpp
-                src/application.cpp
-                src/config.cpp
-                src/updater.cpp
-                src/native/window_manager.cpp
-                src/data_file_handler.cpp
-                src/ui/modals/settings.cpp
-                src/native/single_instance.cpp
-                src/sdk/sdk.cpp
-                src/native/win32_key_util.cpp
+                ${CMAKE_SOURCE_DIR}/src/application.cpp
+                ${CMAKE_SOURCE_DIR}/src/config.cpp
+                ${CMAKE_SOURCE_DIR}/src/updater.cpp
+                ${CMAKE_SOURCE_DIR}/src/native/window_manager.cpp
+                ${CMAKE_SOURCE_DIR}/src/data_file_handler.cpp
+                ${CMAKE_SOURCE_DIR}/src/ui/modals/settings.cpp
+                ${CMAKE_SOURCE_DIR}/src/native/single_instance.cpp
+                ${CMAKE_SOURCE_DIR}/src/sdk/sdk.cpp
+                ${CMAKE_SOURCE_DIR}/src/native/win32_key_util.cpp
                 ${CMAKE_SOURCE_DIR}/extern/PlatformFolders/sago/platform_folders.cpp
                 ${APPLE_EXTRA_LIBS}
-                vector_audio.rc)
+                ${CMAKE_SOURCE_DIR}/vector_audio.rc)
 
 
 if (WIN32)