Skip to content

Commit

Permalink
Fix vcpkg config and usage (gwaldron#2646)
Browse files Browse the repository at this point in the history
  • Loading branch information
ELeeScape authored Oct 21, 2024
1 parent 3829039 commit 52fbdbb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions bootstrap-vcpkg.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
setlocal
set ERROR_MSG=

if "%VCPKG_DIR%" == "" (
FOR /F "tokens=*" %%X IN ('where vcpkg.exe') do (SET VCPKG_DIR=%%~dpX)
if "%VCPKG_ROOT%" == "" (
FOR /F "tokens=*" %%X IN ('where vcpkg.exe') do (SET VCPKG_ROOT=%%~dpX)
)

:: Verify vcpkg is available
set VCPKG_TOOLCHAIN_FILE=%VCPKG_DIR%\scripts\buildsystems\vcpkg.cmake
set VCPKG_TOOLCHAIN_FILE="%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"

if not exist %VCPKG_TOOLCHAIN_FILE% (
set ERROR_MSG=Cannot find vcpkg. Please ensure vcpkg.exe is in your PATH, or set the VCPKG_DIR environment variable to your vcpkg install location
set ERROR_MSG=Cannot find vcpkg. Please ensure vcpkg.exe is in your PATH, or set the VCPKG_ROOT environment variable to your vcpkg install location
goto :usage
)

Expand Down Expand Up @@ -55,7 +55,7 @@ call :realpath !-I!
set INSTALL_DIR=%RETVAL%

:: Ask for confirmation:
echo VCPKG_DIR = %VCPKG_DIR%
echo VCPKG_ROOT = %VCPKG_ROOT%
echo Source location = %SOURCE_DIR%
echo Build location = %BUILD_DIR%
echo Install location = %INSTALL_DIR%
Expand Down
3 changes: 2 additions & 1 deletion vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"spdlog",
"tracy",
"meshoptimizer"
]
],
"builtin-baseline": "9558037875497b9db8cf38fcd7db68ec661bffe7"
}

0 comments on commit 52fbdbb

Please sign in to comment.