diff options
| author | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2010-10-29 12:00:12 +0200 |
|---|---|---|
| committer | Mike FABIAN <mike.fabian@basyskom.de> | 2010-11-03 10:15:46 +0100 |
| commit | 2f9c8d144f6346c19d14d67fe994801ce5e29312 (patch) | |
| tree | 022c75a27632c252f1e698d2d2b1e5f68e993004 | |
| parent | e6aee87ffcbeb23abeb40c0f637d86c1c8f36144 (diff) | |
Changes: do not put mmoc and mgen into subdirectories
RevBy: TrustMe
Details: Under windows the binaries are by default
put into either debug or release subdirectories.
This patch prevents this, so that we do not need to
copy the created binaries around to have them in a
fixed place.
| -rw-r--r-- | mgen/mgen.pro | 5 | ||||
| -rw-r--r-- | mmoc/mmoc.pro | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/mgen/mgen.pro b/mgen/mgen.pro index 3a1943a0..41ac60f7 100644 --- a/mgen/mgen.pro +++ b/mgen/mgen.pro @@ -2,6 +2,7 @@ include(../mkspecs/common.pri) TEMPLATE = app TARGET = mgen +DESTDIR = $$M_BUILD_TREE/mgen target.path = $$M_INSTALL_BIN INCLUDEPATH += . DEPENDPATH += $$INCLUDEPATH @@ -13,10 +14,6 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS -win32-msvc*:{ - target.commands += copy release\mgen.exe . -} - # Dont generate mgen.app bundle for Mac OS X macx:CONFIG -= app_bundle CONFIG += \ diff --git a/mmoc/mmoc.pro b/mmoc/mmoc.pro index a26ffa86..01f5a947 100644 --- a/mmoc/mmoc.pro +++ b/mmoc/mmoc.pro @@ -2,6 +2,7 @@ include(../mkspecs/common.pri) TEMPLATE = app TARGET = mmoc +DESTDIR = $$M_BUILD_TREE/mmoc target.path = $$M_INSTALL_BIN INCLUDEPATH += . DEPENDPATH += $$INCLUDEPATH @@ -13,10 +14,6 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS -win32-msvc*:{ - target.commands += copy release\mmoc.exe . -} - # Dont generate mmoc.app bundle for Mac OS X macx:CONFIG -= app_bundle CONFIG += \ @@ -43,8 +40,8 @@ win32: { } win32 { - !exists ($$M_BUILD_TREE\mmoc\mmoc.pl) { - system (copy $$M_SOURCE_TREE\mmoc\mmoc.pl $$M_BUILD_TREE\mmoc\mmoc.pl) + !exists ($$M_BUILD_TREE/mmoc/mmoc.pl) { + system (copy $$M_SOURCE_TREE\\mmoc\\mmoc.pl $$M_BUILD_TREE\\mmoc\\mmoc.pl) } } else { !exists ($$M_BUILD_TREE/mmoc/mmoc.pl) { |