This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Add default CMake installation path to probe script.#7307
Merged
jhendrixMSFT merged 2 commits intodotnet:masterfrom Mar 29, 2016
jhendrixMSFT:master
Merged
Add default CMake installation path to probe script.#7307jhendrixMSFT merged 2 commits intodotnet:masterfrom jhendrixMSFT:master
jhendrixMSFT merged 2 commits intodotnet:masterfrom
jhendrixMSFT:master
Conversation
CMake 3.5+ MSI-based installations no longer write the installation directory to the registry. To work around this I have added the default installation directory to the probing logic.
Contributor
Author
Contributor
Author
|
@weshaggard can you take a look at my changes to the cmake probing script. |
build-packages.sh
Outdated
| usage | ||
| fi | ||
|
|
||
| if [ ! -e "$working_tree_root/Tools/corerun" ] |
Member
There was a problem hiding this comment.
We don't need this condition as init-tools manages it
Member
|
@jhendrixMSFT could you please add init-tools in build-packages.cmd too? |
Fix syntax errors in if clause (.sh version). Run init-tools script if tools haven't been restored.
Member
|
LGTM |
Member
|
The build-packages changes LGTM. |
|
|
||
| REM ensure that msbuild is available | ||
| echo Running init-tools.cmd | ||
| call %~dp0init-tools.cmd |
Member
There was a problem hiding this comment.
@jhendrixMSFT This change is still not merged. #7220
Member
There was a problem hiding this comment.
Should the output of this call go to some log?
Contributor
Author
There was a problem hiding this comment.
It writes its own log file (init-tools.log).
Member
There was a problem hiding this comment.
init-tools has its own log file, but we can add to packagesLog that we are calling init-tools
Member
|
LGTM |
Member
|
Looks reasonable to me for now. |
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
Add default CMake installation path to probe script. Commit migrated from dotnet/corefx@b0935d2
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 participants
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.
CMake 3.5+ MSI-based installations no longer write the installation
directory to the registry. To work around this I have added the default
installation directory to the probing logic.
Fix syntax errors in build-packages.sh and run init-tools.sh if tools haven't
been restored.