Skip to content

fix directories passed to qmake being ignored

André Simon requested to merge cjmayo:contains into master

Created by: cjmayo

contains() matches the whole value, add regular expressions for the path components.

Test with:

highlight/src/gui-qt $ qmake DEFINES=DOC_DIR=/foo

Before:

highlight/src/gui-qt $ grep DDOC_DIR Makefile 
DEFINES       = -DDOC_DIR=/foo -DO2 -DQT -DDATA_DIR=\"/usr/share/highlight/\" -DCONFIG_DIR=\"/etc/highlight/\" -DDOC_DIR=\"/usr/share/doc/highlight/\" -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB

After:

highlight/src/gui-qt $ grep DDOC_DIR Makefile 
DEFINES       = -DDOC_DIR=/foo -DO2 -DQT -DDATA_DIR=\"/usr/share/highlight/\" -DCONFIG_DIR=\"/etc/highlight/\" -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB

Merge request reports