Skip to content

Commit aa1a8d7

Browse files
committed
Trying to set up working CI for Windows / MacOS
1 parent dab8411 commit aa1a8d7

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,17 @@ jobs:
3333
if (-Not (Test-Path ".\\vcpkg.exe")) {
3434
.\\bootstrap-vcpkg.bat
3535
}
36-
.\\vcpkg.exe install boost-system boost-test openssl --triplet x64-windows
36+
.\\vcpkg.exe install boost-headers boost-system boost-test openssl --triplet x64-windows
3737
3838
- name: Configure (Linux/macOS)
3939
if: runner.os != 'Windows'
4040
run: |
4141
if [ "${{ runner.os }}" = "macOS" ]; then
4242
OPENSSL_ROOT_DIR="$(brew --prefix openssl@3)"
4343
BOOST_ROOT="$(brew --prefix boost)"
44+
BOOST_CMAKE_DIR="$(ls -d "${BOOST_ROOT}"/lib/cmake/Boost-* | head -n 1)"
4445
CMAKE_PREFIX_PATH="${OPENSSL_ROOT_DIR};${BOOST_ROOT}"
45-
cmake . -DTests=ON -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBOOST_ROOT="${BOOST_ROOT}" -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
46+
cmake . -DTests=ON -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBoost_DIR="${BOOST_CMAKE_DIR}" -DBOOST_ROOT="${BOOST_ROOT}" -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
4647
else
4748
cmake . -DTests=ON -DCMAKE_BUILD_TYPE=Release
4849
fi

CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,12 @@ else()
186186
endif()
187187
endif()
188188

189-
if (NOT IS_BSD) # No need to link against dl on BSD.
190-
target_link_libraries(manalyze dl)
191-
endif()
192-
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
189+
if (NOT IS_BSD) # No need to link against dl on BSD.
190+
target_link_libraries(manalyze dl)
191+
endif()
192+
if (NOT APPLE)
193+
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
194+
endif()
193195

194196
# Compile the *nix authenticode plugin if OpenSSL was found.
195197
if (OPENSSL_FOUND)

0 commit comments

Comments
 (0)