equal
deleted
inserted
replaced
54 DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted |
54 DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted |
55 DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private |
55 DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private |
56 |
56 |
57 LIBS *= -L$${HB_BUILD_DIR}/lib |
57 LIBS *= -L$${HB_BUILD_DIR}/lib |
58 LIBS *= -l$$hbLibraryTarget($$LIBRARY) |
58 LIBS *= -l$$hbLibraryTarget($$LIBRARY) |
59 QMAKE_RPATHDIR *= $${HB_BUILD_DIR}/lib |
|
60 unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\" |
59 unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\" |
61 |
60 |
62 export(LIBS) |
61 export(LIBS) |
63 export(INCLUDEPATH) |
62 export(INCLUDEPATH) |
64 export(DEPENDPATH) |
63 export(DEPENDPATH) |
65 export(QMAKE_RPATHDIR) |
|
66 export(HB_COVERAGE_EXCLUDE) |
64 export(HB_COVERAGE_EXCLUDE) |
67 return(true) |
65 return(true) |
68 } |
66 } |
69 |
67 |
70 # params: <collection> |
68 # params: <collection> |
130 system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd) |
128 system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd) |
131 |
129 |
132 # fall back to <builddir>/bin |
130 # fall back to <builddir>/bin |
133 return($$hbNativePath($$HB_BUILD_DIR/bin/$$1)) |
131 return($$hbNativePath($$HB_BUILD_DIR/bin/$$1)) |
134 } |
132 } |
|
133 |
|
134 # params: <file> <dir> |
|
135 defineReplace(hbCopyCommand) { |
|
136 file = $$hbNativePath($$1) |
|
137 dir = $$hbNativePath($$2) |
|
138 |
|
139 chk_dir_exists = $$QMAKE_CHK_DIR_EXISTS $$dir |
|
140 mkdir = $$QMAKE_MKDIR $$dir |
|
141 copy = $$QMAKE_COPY $$file $$dir |
|
142 |
|
143 hbUnixStyle():chk_dir_exists_mkdir = $$chk_dir_exists || $$mkdir |
|
144 else:chk_dir_exists_mkdir = $$chk_dir_exists $$mkdir |
|
145 |
|
146 return(($$chk_dir_exists_mkdir) && $$copy) |
|
147 } |