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

Be compatible with CMake 3.10 again #2296

Merged
merged 3 commits into from
Mar 27, 2020
Merged

Be compatible with CMake 3.10 again #2296

merged 3 commits into from
Mar 27, 2020

Conversation

romainguy
Copy link
Collaborator

Helps with bug #2295

@bejado
Copy link
Member

bejado commented Mar 27, 2020

Can you add the change to the filament-specific-changes.patch file inside the spirv-tools dir?

@romainguy
Copy link
Collaborator Author

Will do!

@romainguy
Copy link
Collaborator Author

@bejado How did you generate that patch file?

@bejado
Copy link
Member

bejado commented Mar 27, 2020

The patch file is the output of git diff. You should be able to merge your diff with the current one via:

git diff | tail -n +5 >> third_party/spirv-tools/filament-specific-changes.patch

@romainguy
Copy link
Collaborator Author

@bejado I fixed the patch file

@bejado
Copy link
Member

bejado commented Mar 27, 2020

Thanks! LGTM after CI passes

@romainguy romainguy merged commit 94a01c6 into master Mar 27, 2020
@romainguy romainguy deleted the rg/cmake branch March 27, 2020 18:15
@unicomp21
Copy link
Contributor

-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Error at CMakeLists.txt:27 (cmake_policy):
Policy "CMP0074" is not known to this version of CMake.

@unicomp21
Copy link
Contributor

^getting another cmake error

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants