Changeset 904 for tests/common.pri

Timestamp:

Jul 24, 2011, 8:49:38 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

tests: Optimize/simplify the build process for shadow building.

File:

• tests/common.pri (modified) (3 diffs)

tests/common.pri

@@ -1 @@
-isEmpty(DEPTH):DEPTH = .
+isEmpty(DEPTH):error("DEPTH is not set before including common.pri!")
 
-os2:PLATFORM        = os2
-else:win32:PLATFORM = win
-else:x11:PLATFORM   = x11
-else:PLATFORM       = unknown
-
-# in debug_and_release, we need a -debug or -release suffix to get separate
-# output paths (it will be replaced with the correct one at runtime)
-debug_and_release:OUTPATH_SUFFIX = -debug
-else:OUTPATH_SUFFIX =
-
-OBJECTS_DIR = $$DEPTH/obj/$${PLATFORM}$${OUTPATH_SUFFIX}
-MOC_DIR = $$OBJECTS_DIR
-DESTDIR = $$OBJECTS_DIR
-
-# target.path isn't there by default
-QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR target.path
-
-target.path = $$DEPTH/bin/$${PLATFORM}$${OUTPATH_SUFFIX}
-INSTALLS += target
+DESTDIR = $$OUT_PWD/$$DEPTH/.
 
 !build_pass: {
@@ -54 +36 @@
 }
 
+# All kinds of builds should have the console if possible
 win32 {
         CONFIG(release, debug|release):CONFIG(qt):contains(QT, gui) {
@@ -63 +46 @@
         }       
 }
+os2 {
+    CONFIG -= windows
+    CONFIG *= console
+}