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.

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

Move to explicitly setting CMake toolchain file #43

Merged
merged 5 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ endif ()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

option(GAP_ENABLE_VCPKG ON)

if (GAP_ENABLE_VCPKG)
include(vcpkg_setup)
endif()

project(
gap
LANGUAGES C CXX
Expand Down Expand Up @@ -219,7 +213,6 @@ if (GAP_INSTALL)

install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler_warnings.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/vcpkg_setup.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/sanitizers.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/static_analyzers.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/project_settings.cmake"
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"description": "Configure with vcpkg toolchain",
"binaryDir": "${sourceDir}/builds/${presetName}",
"generator": "Ninja Multi-Config",
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"toolchainFile": "$env{CMAKE_TOOLCHAIN_FILE}",
Ninja3047 marked this conversation as resolved.
Show resolved Hide resolved
"installDir": "~/opt/gap",
"cacheVariables": {
"CMAKE_CONFIGURATION_TYPES": "Release;RelWithDebInfo;Debug"
Expand Down
3 changes: 1 addition & 2 deletions DockerFile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ WORKDIR /opt/vcpkg

RUN ./bootstrap-vcpkg.sh && ./vcpkg integrate install && \
./vcpkg integrate bash && \
echo 'export PATH=$PATH:/opt/vcpkg' >>~/.bashrc \
echo 'export VCPKG_ROOT=/opt/vcpkg' >>~/.bashrc
echo 'export PATH=$PATH:/opt/vcpkg' >>~/.bashrc

WORKDIR /root
55 changes: 0 additions & 55 deletions cmake/vcpkg_setup.cmake

This file was deleted.

Loading