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.

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

Jump to bottom

Replace Qt variable in generated Makefile. #64

Merged
merged 2 commits into from
Jul 29, 2019
Merged

Replace Qt variable in generated Makefile. #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2aafc9
Replace Qt variable in generated Makefile.
hgaiser Jun 26, 2019
61f5360
use single quotes
dirk-thomas Jul 29, 2019
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
9 changes: 9 additions & 0 deletions cmake/sip_configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,14 @@ def split_paths(paths):
# Force c++11 for qt5
makefile.extra_cxxflags.append('-std=c++11')

# Finalise the Makefile, preparing it to be saved to disk
makefile.finalise()

# Replace Qt variables from libraries
libs = makefile.LIBS.as_list()
for i in range(len(libs)):
libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
makefile.LIBS.set(libs)

# Generate the Makefile itself
makefile.generate()