Skip to content

Commit

Permalink
define all envvars in azure-pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
sc1f committed Apr 13, 2020
1 parent 582cdbf commit 134c2bc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ jobs:
# Set `BOOST_ROOT` manually, as `BOOST_ROOT` is removed in the VM:
# https://github.com/actions/virtual-environments/issues/687
BOOST_ROOT: "C:/hostedtoolcache/windows/Boost/1.72.0/"
BOOST_INCLUDEDIR: "C:/hostedtoolcache/windows/Boost/1.72.0/include"
BOOST_LIBRARYDIR: "C:/hostedtoolcache/windows/Boost/1.72.0/libs"


- job: 'Mac'
Expand Down
12 changes: 5 additions & 7 deletions cpp/perspective/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,11 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
cmake_policy(SET CMP0074 NEW)

if(DEFINED(ENV{BOOST_ROOT}))
# set(Boost_NO_BOOST_CMAKE ON)
set(BOOST_INCLUDEDIR $ENV{BOOST_ROOT}/include)
set(BOOST_LIBRARYDIR $ENV{BOOST_ROOT}/lib)
set(Boost_NO_BOOST_CMAKE TRUE)

message("${Cyan}BOOST_ROOT: ENV{$BOOST_ROOT} ${ColorReset}")
message("${Cyan}BOOST_INCLUDEDIR: ${BOOST_INCLUDEDIR} ${ColorReset}")
message("${Cyan}BOOST_LIBRARYDIR: ${BOOST_LIBRARYDIR} ${ColorReset}")
message(WARNING "${Cyan}BOOST_ROOT: ENV{$BOOST_ROOT} ${ColorReset}")
message(WARNING "${Cyan}BOOST_INCLUDEDIR: ${BOOST_INCLUDEDIR} ${ColorReset}")
message(WARNING "${Cyan}BOOST_LIBRARYDIR: ${BOOST_LIBRARYDIR} ${ColorReset}")
endif()

endif()
Expand Down Expand Up @@ -333,7 +331,7 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
# When linking against Boost on Azure, bcrypt fails to link:
# - https://github.com/microsoft/vcpkg/issues/4481
# - https://github.com/boostorg/uuid/issues/68
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_UUID_FORCE_AUTO_LINK")
#add_definitions("-DBOOST_UUID_FORCE_AUTO_LINK")
else()
include_directories("/usr/local/include")
endif()
Expand Down

0 comments on commit 134c2bc

Please sign in to comment.