Add support for vcpkg #26
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…is not found This provides a better user experience for new users who run the tool outside of a CMake source tree, who would later have to clean up those directories.
pentatonick
commented
May 24, 2024
| @@ -403,9 +412,6 @@ def PositiveInt(string): | |||
| toolset = 'v{}0_xp'.format(toolchain_entry.vs_version) | |||
| generate_command.append('-T{}'.format(toolset)) | |||
|
|
|||
| if toolchain_option: | |||
There was a problem hiding this comment.
This condition was removed because toolchain_option (and transitively toolchain_path) was always present.
pentatonick
commented
May 24, 2024
| @@ -380,9 +385,13 @@ def PositiveInt(string): | |||
| generate_command = [ | |||
| cmake_bin, | |||
| '-H{}'.format(home), | |||
| build_dir_option | |||
| '-B{}'.format(build_dir), | |||
| '-DCMAKE_TOOLCHAIN_FILE={}'.format(args.vcpkg if args.vcpkg else toolchain_path) | |||
There was a problem hiding this comment.
preferred
'-DCMAKE_TOOLCHAIN_FILE={}'.format(args.vcpkg if args.vcpkg else toolchain_path)over
'-DCMAKE_TOOLCHAIN_FILE={}'.format(toolchain_path if not args.vcpkg else args.vcpkg)to avoid negative logic.
pentatonick
commented
May 24, 2024
| @@ -309,7 +315,6 @@ def PositiveInt(string): | |||
|
|
|||
| build_dir = os.path.join(cdir, '_builds', build_tag) | |||
| print("Build dir: {}".format(build_dir)) | |||
| build_dir_option = "-B{}".format(build_dir) | |||
There was a problem hiding this comment.
Removed build_dir_option to match the current style of generate_command below.
Added the --vcpkg flag which enables vcpkg support and optionally allows to specify path to vcpkg.cmake
pentatonick
force-pushed
the
vcpkg-support
branch
from
4eb2df1
to
e653160
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added the --vcpkg flag which enables vcpkg support and optionally allows to specify path to vcpkg.cmake