diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 3fb5cd6..3696392 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -15,9 +15,10 @@ jobs: compiler: - {cxx: "g++-9", c: "gcc-9"} - {cxx: "g++-10", c: "gcc-10"} - - {cxx: "clang++-10", c: "clang-10"} - - {cxx: "clang++-11", c: "clang-11"} + - {cxx: "g++-11", c: "gcc-11"} - {cxx: "clang++-12", c: "clang-12"} + - {cxx: "clang++-13", c: "clang-13"} + - {cxx: "clang++-14", c: "clang-14"} cxx_standard: [11, 14, 17, 20] steps: diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 9e05b03..3470bf2 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -21,18 +21,13 @@ jobs: - name: Update Submodules run: git submodule update --init --recursive - - name: Install Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.11.0 - - name: Setup MSVC uses: TheMrMilchmann/setup-msvc-dev@v1 with: arch: ${{matrix.architecture}} - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -GNinja + run: cmake -B ${{github.workspace}}/build -DSAMPLES_BUILD=ON -DSAMPLES_BUILD_ONLY_DYNAMIC=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 446352e..ab23486 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -12966,11 +12966,6 @@ void VulkanHppGenerator::setVulkanLicenseHeader( int line, std::string const & c { m_vulkanLicenseHeader.replace( pos, 1, "\n// " ); } - // replace any " \n" with "\n" - for ( size_t pos = m_vulkanLicenseHeader.find( " \n" ); pos != std::string::npos; pos = m_vulkanLicenseHeader.find( " \n", pos ) ) - { - m_vulkanLicenseHeader.replace( pos, 2, "\n" ); - } // remove any trailing spaces m_vulkanLicenseHeader = trimEnd( m_vulkanLicenseHeader );