File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -8,6 +8,12 @@ elseif(APPLE)
88else ()
99 set (VCPKG_TARGET_TRIPLET "x64-linux" CACHE STRING "Vcpkg triplet" )
1010endif ()
11+ if ("$ENV{VCPKG_ROOT} " STREQUAL "" )
12+ set (VCPKG_ROOT_TMP "${sourceDir} /vcpkg/bin" )
13+ else ()
14+ set (VCPKG_ROOT_TMP "$ENV{VCPKG_ROOT} " )
15+ endif ()
16+ set (VCPKG_ROOT_ACTIVE "${VCPKG_ROOT_TMP} " CACHE STRING "Configured VCPKG root to find toolchain" )
1117
1218project (${_name} VERSION ${_version} )
1319option (ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" OFF )
Original file line number Diff line number Diff line change 99 {
1010 "name" : " template" ,
1111 "hidden" : true ,
12- "toolchainFile" : " vcpkg/bin /scripts/buildsystems/vcpkg.cmake" ,
12+ "toolchainFile" : " $env{VCPKG_ROOT_ACTIVE} /scripts/buildsystems/vcpkg.cmake" ,
1313 "cacheVariables" : {
1414 "ENABLE_FRONTEND_API" : true ,
1515 "ENABLE_QT" : true ,
Original file line number Diff line number Diff line change 3838 build_.*
3939 cmake/\\.CMakeBuildNumber
4040 release/
41- vcpkg/
41+ vcpkg/bin/
4242)
4343
4444set (CPACK_VERBATIM_VARIABLES YES )
You can’t perform that action at this time.
0 commit comments