Merge pull request #692 from alemuntoni/fix_qmake_build

Fix qmake build when compiling from root dir
This commit is contained in:
Alessandro Muntoni 2020-05-25 16:24:11 +02:00 committed by GitHub
commit 215ee447a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -276,8 +276,7 @@ edit_pickpoints.depends = common
# if distrib folder is not in $$PWD/../distrib (shadow build case),
# we need to copy all the files inside $$PWD/../distrib in the actual
# distrib folder ($$OUT_PWD/distrib or $$MESHLAB_DISTRIB_DIRECTORY)
!equals(PWD, $$OUT_PWD) {
!equals(PWD, $$OUT_PWD) : !equals(PWD, $$OUT_PWD/src) {
#copying the "lib" folder inside the $$OUT_PWD/distrib
win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD/distrib)\"
!win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD)\"