Skip to content

Commit

Permalink
Merge pull request #14146 from JoergAtGithub/ENV__MIXXX_VCPKG_ROOT
Browse files Browse the repository at this point in the history
Fix wrong access to ENV var MIXXX_VCPKG_ROOT instead of CMake setting MIXXX_VCPKG_ROOT
  • Loading branch information
daschuer authored Jan 9, 2025
2 parents 7204049 + bb34577 commit 423d42e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ if(DEFINED ENV{MIXXX_VCPKG_ROOT} AND NOT DEFINED MIXXX_VCPKG_ROOT)
endif()

if(DEFINED MIXXX_VCPKG_ROOT)
if(EXISTS "$ENV{MIXXX_VCPKG_ROOT}/overlay/ports" OR NOT EXISTS "$ENV{MIXXX_VCPKG_ROOT}/ports")
if(EXISTS "${MIXXX_VCPKG_ROOT}/overlay/ports" OR NOT EXISTS "${MIXXX_VCPKG_ROOT}/ports")
# MIXXX_VCPKG_ROOT points to our vcpkg environment
# and we configure the CMAKE_TOOLCHAIN_FILE and overlays accordingly
message(STATUS "Using MIXXX_VCPKG_ROOT: $ENV{MIXXX_VCPKG_ROOT}")
message(STATUS "Using MIXXX_VCPKG_ROOT: ${MIXXX_VCPKG_ROOT}")
else()
message(STATUS "MIXXX_VCPKG_ROOT not correct (missing $ENV{MIXXX_VCPKG_ROOT}/overlay/ports)")
message(STATUS "MIXXX_VCPKG_ROOT not correct (missing ${MIXXX_VCPKG_ROOT}/overlay/ports)")
FATAL_ERROR_MISSING_ENV()
endif()

Expand Down

0 comments on commit 423d42e

Please sign in to comment.