Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix vcpkg use #307

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Fix vcpkg use #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions cmake/vcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,41 @@ macro(find_vcpkg)
"$ENV{ProgramFiles}/Microsoft Visual Studio/*/*/VC/vcpkg/"
"$ENV{USERPROFILE}$ENV{HOME}/vcpkg/"
)
if (EXISTS ${VCPKG_EXECUTABLE})
get_filename_component(dir ${VCPKG_EXECUTABLE} DIRECTORY)
set(CMAKE_TOOLCHAIN_FILE "${dir}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
endif ()
endif()
if (EXISTS ${VCPKG_EXECUTABLE})
get_filename_component(dir ${VCPKG_EXECUTABLE} DIRECTORY)
set(CMAKE_TOOLCHAIN_FILE "${dir}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
endif ()
if(EXISTS ${CMAKE_TOOLCHAIN_FILE})
set(VCPKG_FOUND TRUE CACHE BOOL "VCPKG toolchain file found ${CMAKE_TOOLCHAIN_FILE}")
list(APPEND CMAKE_PROJECT_TOP_LEVEL_INCLUDES "${CMAKE_TOOLCHAIN_FILE}")
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_PROJECT_TOP_LEVEL_INCLUDES)
endif()
endif()
endmacro()

macro(fetch_vcpkg)
include(gitect)
if(GIT_EXECUTABLE)
execute_process(
COMMAND ${GIT_EXECUTABLE} clone https://github.com/microsoft/vcpkg
WORKING_DIRECTORY $ENV{USERPROFILE}$ENV{HOME}
)
execute_process(
COMMAND ${CMAKE_COMMAND} --build .
WORKING_DIRECTORY ${vcpkg_SOURCE_DIR}
)
endif()
include(FetchContent)
FetchContent_Populate( VCPKG
GIT_REPOSITORY https://github.com/microsoft/vcpkg.git
GIT_TAG 703a8113f42e794534df5dfc5cece5dabcb949d0
SOURCE_DIR "$ENV{USERPROFILE}$ENV{HOME}/vcpkg"
)

# if(GIT_EXECUTABLE)
# execute_process(
# COMMAND ${GIT_EXECUTABLE} clone https://github.com/microsoft/vcpkg
# WORKING_DIRECTORY $ENV{USERPROFILE}$ENV{HOME}
# )
# execute_process(
# COMMAND ${CMAKE_COMMAND} --build .
# WORKING_DIRECTORY ${vcpkg_SOURCE_DIR}
# )
# endif()
endmacro()

if(NOT ${VCPKG_FOUND})
if(NOT VCPKG_FOUND)
find_vcpkg()
endif()

Expand Down
Loading