Skip to content

Commit cda8a3b

Browse files
author
Charity Kathure
committed
other configuration shifts
Signed-off-by: Charity Kathure <[email protected]>
1 parent 6c4e318 commit cda8a3b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

LogMonitor/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ set(VCPKG_TARGET_TRIPLET x64-windows)
1414
if (DEFINED ENV{VCPKG_ROOT})
1515
set(VCPKG_ROOT $ENV{VCPKG_ROOT})
1616
set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Toolchain file for vcpkg" FORCE)
17+
18+
# Set Boost paths
19+
set(BOOST_ROOT "${VCPKG_ROOT}/installed/x64-windows" CACHE PATH "Boost installation root")
20+
set(Boost_INCLUDE_DIR "${VCPKG_ROOT}/installed/x64-windows/include" CACHE PATH "Boost include directory")
21+
22+
# Set Google Test paths
23+
set(GTest_INCLUDE_DIRS "${VCPKG_ROOT}/installed/x64-windows/include" CACHE PATH "Google Test include directory")
1724
endif()
1825

1926
# Set Windows SDK version if available

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
inputs:
9696
workingDirectory: '$(Build.SourcesDirectory)\LogMonitor'
9797
cmakeArgs: |
98-
-DBOOST_ROOT=$(VCPKG_ROOT)\installed\x64-windows -DBoost_INCLUDE_DIR=$(VCPKG_ROOT)\installed\x64-windows\include -DGTest_INCLUDE_DIRS=$(VCPKG_ROOT)\installed\x64-windows\include -A x64 -S $(Build.SourcesDirectory)\LogMonitor -B $(Build.BinariesDirectory)\LogMonitor\x64
98+
-A x64 -S $(Build.SourcesDirectory)\LogMonitor -B $(Build.BinariesDirectory)\LogMonitor\x64
9999
100100
- task: CMake@1
101101
displayName: 'Build with CMake'

0 commit comments

Comments
 (0)