Skip to content

configure: revert to -isystem rather than -idirafter #2754

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.

Sign up for GitHub

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

Merged
jdtournier merged 2 commits into from
Nov 22, 2023
Merged

configure: revert to -isystem rather than -idirafter #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5fefd7
configure: revert to -isystem rather than -idirafter
jdtournier Nov 22, 2023
17246b5
move doc generation check to linux-clang build
jdtournier Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get update
sudo apt-get install clang libqt5opengl5-dev libqt5svg5-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev
sudo apt-get install clang libqt5opengl5-dev libqt5svg5-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev python3-distutils

- name: configure
run: ./configure -assert || { cat configure.log; false; }
Expand All @@ -41,6 +41,8 @@ jobs:
- name: binary tests
run: ./run_tests binaries || { cat testing_binaries.log; false; }

- name: check command documentation
run: ./docs/generate_user_docs.sh && git diff --exit-code docs/



Expand Down Expand Up @@ -103,9 +105,6 @@ jobs:
- name: binary tests
run: ./run_tests binaries || { cat testing_binaries.log; false; }

- name: check command documentation
run: ./docs/generate_user_docs.sh && git diff --exit-code docs/




Expand Down
4 changes: 2 additions & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def get_flags (default=None, env=None, pkg_config_flags=None):
flags = []
for flag in shlex.split (execute ([ 'pkg-config' ] + pkg_config_flags.split(), RunError)[1]):
if flag.startswith ('-I'):
flags += [ '-idirafter', flag[2:] ]
flags += [ '-isystem', flag[2:] ]
else:
flags += [ flag ]
return flags
Expand Down Expand Up @@ -1318,7 +1318,7 @@ int main() { Foo f; }
if entry[0] != '$' and not entry == '-I.':
entry = entry.replace('\"','').replace("'",'')
if entry.startswith('-I'):
qt_cflags += [ '-idirafter', entry[2:] ]
qt_cflags += [ '-isystem', entry[2:] ]
else:
qt_cflags += [ entry ]

Expand Down