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

Move to explicitly setting CMake toolchain file #43

Merged
merged 5 commits into from
Jan 4, 2024
Merged

Move to explicitly setting CMake toolchain file #43

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fc7c40
Move to explicitly setting CMake toolchain file
Ninja3047 Jan 2, 2024
f2de365
fix preset
Ninja3047 Jan 2, 2024
90adce0
add back VCPKG_ROOT
Ninja3047 Jan 2, 2024
652c0df
update README to mention setting VCPKG_ROOT if using preset
Ninja3047 Jan 2, 2024
4804e64
move NOTE to correct section
Ninja3047 Jan 2, 2024
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cmake --build --preset ninja-multi-vcpkg
## Install & Integrate

Simply use cmake install infrastructure:
NOTE: if using the vcpkg preset, `VCPKG_ROOT` must be set to the root directory of the vcpkg instance
Ninja3047 marked this conversation as resolved.
Show resolved Hide resolved

```
cmake -DCMAKE_INSTALL_PREFIX:PATH=<path> --build --preset ninja-multi-vcpkg --target install
Expand Down
55 changes: 0 additions & 55 deletions cmake/vcpkg_setup.cmake
View file
Open in desktop

This file was deleted.

Loading