mirror of
https://github.com/wolfpld/tracy.git
synced 2025-03-20 07:40:02 +08:00
fix windows vcpkg
This commit is contained in:
parent
4c293dc0de
commit
1a3985ec93
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -31,7 +31,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install Windows Dependencies
|
- name: Install Windows Dependencies
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
run: vcpkg integrate install
|
run: ./vcpkg/install_vcpkg_dependencies.bat
|
||||||
|
|
||||||
- name: Install MacOS Dependencies
|
- name: Install MacOS Dependencies
|
||||||
if: startsWith(matrix.os, 'macos')
|
if: startsWith(matrix.os, 'macos')
|
||||||
|
|||||||
@ -3,6 +3,10 @@
|
|||||||
|
|
||||||
set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../")
|
set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../")
|
||||||
|
|
||||||
|
if (EXISTS ${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig)
|
||||||
|
set(ENV{PKG_CONFIG_PATH} "${ROOT_DIR}/vcpkg_installed/x64-windows-static/lib/pkgconfig")
|
||||||
|
endif()
|
||||||
|
|
||||||
# Dependencies are taken from the system first and if not found, they are pulled with CPM and built from source
|
# Dependencies are taken from the system first and if not found, they are pulled with CPM and built from source
|
||||||
|
|
||||||
include(FindPkgConfig)
|
include(FindPkgConfig)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user