Updated Github actions.

5cript · Oct 10, 2023 · b9db8b4 · b9db8b4
1 parent 120a946
commit b9db8b4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -107,21 +107,26 @@ jobs:
 
       - run: brew install ninja boost cryptopp curl llvm@16
 
+      - name: Get Brew Prefix
+        run: |
+          echo "export BREW_PREFIX=$(brew --prefix)" >> $GITHUB_ENV
+
       - name: Set Env Vars
         run: |
-          echo "export LDFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV
-          echo "export CPPFLAGS=-I/opt/homebrew/include" >> $GITHUB_ENV
+          echo "export LDFLAGS=-L${{env.BREW_PREFIX}}/lib" >> $GITHUB_ENV
+          echo "export CPPFLAGS=-I${{env.BREW_PREFIX}}/include" >> $GITHUB_ENV
 
       - name: Configure CMake
         run: >
           cmake
-          -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm@16/bin/clang
-          -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm@16/bin/clang++
-          -DCMAKE_LINKER=/opt/homebrew/opt/llvm@16/bin/lld
+          -DCMAKE_C_COMPILER=${{env.BREW_PREFIX}}/opt/llvm@16/bin/clang
+          -DCMAKE_CXX_COMPILER=${{env.BREW_PREFIX}}/opt/llvm@16/bin/clang++
+          -DCMAKE_LINKER=${{env.BREW_PREFIX}}/opt/llvm@16/bin/lld
           -S ${{github.workspace}}
           -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
           -G"Ninja"
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -DBREW_PREFIX="${{env.BREW_PREFIX}}"
           -DNUI_BUILD_EXAMPLES=off
           -DCMAKE_CXX_EXTENSIONS=on
           -DCMAKE_CXX_STANDARD=20

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,7 @@ endif()
 include(./cmake/warnings.cmake)
 include(./cmake/example_target.cmake)
 include(./cmake/options.cmake)
+include(./cmake/brew.cmake)
 
 # Deps
 include(./cmake/dependencies/boost.cmake)

diff --git a/cmake/brew.cmake b/cmake/brew.cmake
@@ -0,0 +1 @@
+set(BREW_PREFIX "/opt/homebrew" CACHE STRING "Homebrew install prefix")
diff --git a/cmake/dependencies/cryptopp.cmake b/cmake/dependencies/cryptopp.cmake
@@ -12,8 +12,8 @@ if (WIN32)
         target_link_libraries(roar-cryptopp INTERFACE cryptopp-static)
     endif()
 elseif(APPLE)
-    find_library(CRYPTOPP_LIB libcryptopp.a HINTS /opt/homebrew/lib)
-    target_include_directories(roar-cryptopp INTERFACE /opt/homebrew/include)
+    find_library(CRYPTOPP_LIB libcryptopp.a HINTS ${BREW_PREFIX}/lib)
+    target_include_directories(roar-cryptopp INTERFACE ${BREW_PREFIX}/include)
     target_link_libraries(roar-cryptopp INTERFACE ${CRYPTOPP_LIB})
 elseif(UNIX)
     pkg_check_modules(cryptopp IMPORTED_TARGET libcrypto++)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(BREW_PREFIX "/opt/homebrew" CACHE STRING "Homebrew install prefix")