mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-22 00:06:12 -05:00
fix macos build
This commit is contained in:
parent
d1e63f61aa
commit
d1e0bb6f81
@ -33,7 +33,7 @@ if(NOT SDK_PATH STREQUAL "")
|
||||
message(STATUS "Building with SDK -- ${SDK_PATH}")
|
||||
set(CMAKE_TOOLCHAIN_FILE "${SDK_PATH}/scripts/buildsystems/vcpkg.cmake")
|
||||
if(APPLE AND NOT VCPKG_TARGET_TRIPLET)
|
||||
set(VCPKG_TARGET_TRIPLET "x64-osx-dynamic")
|
||||
message(FATAL_ERROR "VCPKG_TARGET_TRIPLET not set (set it to arm64-osx-dynamic-release or x64-osx-dynamic-release")
|
||||
endif()
|
||||
set(WITH_VCPKG ON)
|
||||
elseif(WITH_VCPKG)
|
||||
@ -44,7 +44,11 @@ else()
|
||||
endif()
|
||||
|
||||
if(WITH_VCPKG)
|
||||
list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALL_PREFIX}/${VCPKG_TARGET_TRIPLET}/")
|
||||
if(WIN32)
|
||||
list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALL_PREFIX}/${VCPKG_TARGET_TRIPLET}/tools/python3/Scripts/")
|
||||
else()
|
||||
list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALL_PREFIX}/${VCPKG_TARGET_TRIPLET}/bin")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
#############################################################
|
||||
|
Loading…
x
Reference in New Issue
Block a user