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

[vsg] Update to v1.0.6 #31874

Merged
merged 3 commits into from
Jun 12, 2023
Merged

[vsg] Update to v1.0.6 #31874

merged 3 commits into from
Jun 12, 2023

Conversation

cbrl
Copy link
Contributor

@cbrl cbrl commented Jun 7, 2023

In addition to updating vsg to version 1.0.6, this also changes the order that the glslang and Vulkan targets are linked, which may prevent the error described in #31801.

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@cbrl
Copy link
Contributor Author

cbrl commented Jun 7, 2023

The glslang fix was actually merged in a separate PR just before I opened this, so that comment can be ignored. This PR just updates vsg to v1.0.6.

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Jun 8, 2023
@MonicaLiu0311
Copy link
Contributor

usage:

vsg provides CMake targets:

    # this is heuristically generated, and may not be correct
    find_package(vsg CONFIG REQUIRED)
    target_link_libraries(main PRIVATE vsg::vsg)

When testing usage, the following error occurs:

1> [CMake] CMake Error at E:/vsg/installed/x64-windows/share/vsg/vsgTargets.cmake:60 (set_target_properties):
1> [CMake]   The link interface of target "vsg::vsg" contains:
1> [CMake] 
1> [CMake]     glslang::glslang
1> [CMake] 
1> [CMake]   but the target was not found.  Possible reasons include:
1> [CMake] 
1> [CMake]     * There is a typo in the target name.
1> [CMake]     * A find_package call is missing for an IMPORTED target.
1> [CMake]     * An ALIAS target is missing.
1> [CMake] 
1> [CMake] Call Stack (most recent call first):
1> [CMake]   E:/vsg/installed/x64-windows/share/vsg/vsgConfig.cmake:7 (include)
1> [CMake]   E:/vsg/scripts/buildsystems/vcpkg.cmake:853 (_find_package)
1> [CMake]   CMakeFindUsage/CMakeLists.txt:17 (find_package)
1> [CMake] -- Generating done (0.0s)
1> [CMake] CMake Generate step failed.  Build files cannot be regenerated correctly.
CMakeFindUsage.cpp
#include <iostream>
#include "vsg/all.h"

using namespace std;

int main()
{
cout << "Hello CMake." << endl;
return 0;
}

CMakeLists.txt
cmake_minimum_required (VERSION 3.8)

set(CMAKE_TOOLCHAIN_FILE "E:/vsg/scripts/buildsystems/vcpkg.cmake")

project ("CMakeFindUsage")

add_executable (main "CMakeFindUsage.cpp")

find_package(vsg CONFIG REQUIRED)
target_link_libraries(main PRIVATE vsg::vsg)

@cbrl
Copy link
Contributor Author

cbrl commented Jun 9, 2023

The linkage issue should be fixed now. The test program above can configure and compile on x64-windows.

@MonicaLiu0311
Copy link
Contributor

The usage test passed (header files found):

vsg provides CMake targets:

    # this is heuristically generated, and may not be correct
    find_package(vsg CONFIG REQUIRED)
    target_link_libraries(main PRIVATE vsg::vsg)

@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Jun 12, 2023
@vicroms vicroms merged commit 61f14c4 into microsoft:master Jun 12, 2023
@cbrl cbrl deleted the vsg-1.0.6 branch June 14, 2023 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants