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

[vcpkg.cmake] check for vcpkg.json only in ${CMAKE_SOURCE_DIR} #12523

Merged
merged 5 commits into from
Aug 22, 2020

Conversation

strega-nil
Copy link
Contributor

So @Neumann-A has suggested this, and I think it's reasonable to do this. This means that we don't check outside of the directory containing the CMakeLists.txt.

I also have not changed the MSBuild, since I expect that many people will put their vcpkg.json into the solution directory, and there's not a standard variable for the solution directory. I'm not sure if this is the right thing to do; if anyone has opinions, please post them here.

Also, cc @Neumann-A of course.

@Neumann-A
Copy link
Contributor

The question here is if you would like to support:

my-big-project/
  vcpkg.json
  CMakeLists.txt
  smaller-project/
    CMakeLists.txt 
    vcpkg.json
  other-project/
    CMakeLists.txt 
    vcpkg.json

which loads all vcpkg.json recursively. Instead of only the one from the toplevel project.
(needs a bit of investigation if each project() call reloads the toolchain)

@Neumann-A
Copy link
Contributor

Neumann-A commented Jul 21, 2020

I also have not changed the MSBuild, since I expect that many people will put their vcpkg.json into the solution directory, and there's not a standard variable for the solution directory.

What is wrong with $(ProjectDir) ? (Nevermind you are already using MSBuildProjectDirectory which seems to resolve to the same directory.)

@strega-nil
Copy link
Contributor Author

strega-nil commented Jul 22, 2020

@Neumann-A solution != project.

The former would have to be done via interdependencies, and is made no different by this change.

@strega-nil
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@BillyONeal BillyONeal merged commit b919cf7 into microsoft:master Aug 22, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution :)

ras0219 pushed a commit to ras0219/vcpkg that referenced this pull request Aug 23, 2020
strega-nil pushed a commit that referenced this pull request Aug 23, 2020
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
@strega-nil strega-nil deleted the manifest-in-source branch September 10, 2020 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants