зеркало из https://github.com/microsoft/vcpkg.git
Reduce repetition of relative paths in vcpkg.cmake to reduce future errors
This commit is contained in:
Родитель
a362959430
Коммит
cdfa4ea1df
|
@ -22,19 +22,19 @@ if(NOT VCPKG_TOOLCHAIN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(_VCPKG_TARGET_TRIPLET ${_VCPKG_TARGET_TRIPLET_ARCH}-${_VCPKG_TARGET_TRIPLET_PLAT})
|
set(_VCPKG_TARGET_TRIPLET ${_VCPKG_TARGET_TRIPLET_ARCH}-${_VCPKG_TARGET_TRIPLET_PLAT})
|
||||||
|
set(_VCPKG_INSTALLED_DIR ${CMAKE_CURRENT_LIST_DIR}/../../installed)
|
||||||
set(_VCPKG_TOOLCHAIN_DIR ${CMAKE_CURRENT_LIST_DIR})
|
set(_VCPKG_TOOLCHAIN_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
|
if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
|
||||||
list(APPEND CMAKE_PREFIX_PATH
|
list(APPEND CMAKE_PREFIX_PATH
|
||||||
${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}/debug
|
${_VCPKG_INSTALLED_DIR}/${_VCPKG_TARGET_TRIPLET}/debug
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
list(APPEND CMAKE_PREFIX_PATH
|
list(APPEND CMAKE_PREFIX_PATH
|
||||||
${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}
|
${_VCPKG_INSTALLED_DIR}/${_VCPKG_TARGET_TRIPLET}
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}/include)
|
include_directories(${_VCPKG_INSTALLED_DIR}/${_VCPKG_TARGET_TRIPLET}/include)
|
||||||
|
|
||||||
option(OVERRIDE_ADD_EXECUTABLE "Automatically copy dependencies into the output directory for executables." ON)
|
option(OVERRIDE_ADD_EXECUTABLE "Automatically copy dependencies into the output directory for executables." ON)
|
||||||
if(OVERRIDE_ADD_EXECUTABLE)
|
if(OVERRIDE_ADD_EXECUTABLE)
|
||||||
|
@ -43,7 +43,7 @@ if(NOT VCPKG_TOOLCHAIN)
|
||||||
add_custom_command(TARGET ${name} POST_BUILD
|
add_custom_command(TARGET ${name} POST_BUILD
|
||||||
COMMAND powershell -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
|
COMMAND powershell -executionpolicy UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
|
||||||
-targetBinary $<TARGET_FILE:${name}>
|
-targetBinary $<TARGET_FILE:${name}>
|
||||||
-installedDir "${_VCPKG_TOOLCHAIN_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
|
-installedDir "${_VCPKG_INSTALLED_DIR}/${_VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
|
||||||
-OutVariable out
|
-OutVariable out
|
||||||
)
|
)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
Загрузка…
Ссылка в новой задаче