Skip to content

Commit af68027

Browse files
committed
Pass old style boost search option to cmake only on appveyor.
1 parent 4b8967d commit af68027

1 file changed

Lines changed: 14 additions & 21 deletions

File tree

appveyor.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
1010
cpp11: -DMSGPACK_CXX11=ON
1111
msvc: '"Visual Studio 14 2015"'
12-
boost_prefix: C:\Libraries\boost_1_86_0
12+
boost_prefix: C:\Libraries\boost_1_69_0
1313
boost_subdir: lib32-msvc-14.0
1414
build_script:
1515
- ps: |
@@ -37,29 +37,21 @@ build_script:
3737
cd build
3838
3939
# Debug: Check Boost directories
40-
Write-Host "=== Checking C:\Libraries for Boost installations ==="
41-
dir C:\Libraries\boost* | Format-Table Name
40+
Write-Host "=== Checking Boost installation at $env:boost_prefix ==="
41+
if (Test-Path "$env:boost_prefix") {
42+
Write-Host "Boost directory found!"
43+
Write-Host "Top-level contents:"
44+
dir $env:boost_prefix | Format-Table Name -AutoSize
4245
43-
Write-Host "=== Checking if boost_1_86_0 exists ==="
44-
if (Test-Path "C:\Libraries\boost_1_86_0") {
45-
Write-Host "boost_1_86_0 found!"
46-
dir C:\Libraries\boost_1_86_0 | Format-Table Name
47-
48-
Write-Host "=== Checking lib32-msvc-14.0 ==="
49-
if (Test-Path "C:\Libraries\boost_1_86_0\lib32-msvc-14.0") {
50-
dir C:\Libraries\boost_1_86_0\lib32-msvc-14.0
51-
52-
Write-Host "=== Checking cmake directory ==="
53-
if (Test-Path "C:\Libraries\boost_1_86_0\lib32-msvc-14.0\cmake") {
54-
dir C:\Libraries\boost_1_86_0\lib32-msvc-14.0\cmake
55-
} else {
56-
Write-Host "cmake directory not found in lib32-msvc-14.0"
57-
}
46+
Write-Host "=== Checking $env:boost_subdir ==="
47+
if (Test-Path "$env:boost_prefix\$env:boost_subdir") {
48+
Write-Host "Library directory found!"
49+
dir "$env:boost_prefix\$env:boost_subdir" | Select-Object -First 10
5850
} else {
59-
Write-Host "lib32-msvc-14.0 not found"
51+
Write-Host "$env:boost_subdir not found"
6052
}
6153
} else {
62-
Write-Host "boost_1_86_0 NOT found!"
54+
Write-Host "ERROR: Boost directory NOT found at $env:boost_prefix"
6355
}
6456
6557
Write-Host "=== Starting CMake configuration ==="
@@ -69,8 +61,9 @@ build_script:
6961
$env:cpp11 `
7062
-D MSGPACK_BUILD_EXAMPLES=ON `
7163
-D MSGPACK_BUILD_TESTS=ON `
64+
-D Boost_NO_BOOST_CMAKE=ON `
7265
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
73-
-D CMAKE_PREFIX_PATH="C:\Libraries\boost_1_86_0\lib32-msvc-14.0\cmake\Boost-1.86.0;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
66+
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
7467
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
7568
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
7669
..

0 commit comments

Comments
 (0)