Changeset 904


Ignore:
Timestamp:
Jul 24, 2011, 6:49:38 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
tests
Files:
6 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • tests/blit/blit.pro

    r436 r904  
     1DEPTH = ..
     2include($$DEPTH/common.pri)
     3
    14QT = core gui
    25
    3 SOURCES += blit.cpp
    4 
    5 DEPTH = .
    6 include($$DEPTH/../common.pri)
    7 else:error("Cannot include $$DEPTH/../common.pri!")
    8 
    9 CONFIG -= windows
    10 CONFIG *= console
     6SOURCES = blit.cpp
  • tests/common.pri

    r610 r904  
    1 isEmpty(DEPTH):DEPTH = .
     1isEmpty(DEPTH):error("DEPTH is not set before including common.pri!")
    22
    3 os2:PLATFORM        = os2
    4 else:win32:PLATFORM = win
    5 else:x11:PLATFORM   = x11
    6 else:PLATFORM       = unknown
    7 
    8 # in debug_and_release, we need a -debug or -release suffix to get separate
    9 # output paths (it will be replaced with the correct one at runtime)
    10 debug_and_release:OUTPATH_SUFFIX = -debug
    11 else:OUTPATH_SUFFIX =
    12 
    13 OBJECTS_DIR = $$DEPTH/obj/$${PLATFORM}$${OUTPATH_SUFFIX}
    14 MOC_DIR = $$OBJECTS_DIR
    15 DESTDIR = $$OBJECTS_DIR
    16 
    17 # target.path isn't there by default
    18 QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR target.path
    19 
    20 target.path = $$DEPTH/bin/$${PLATFORM}$${OUTPATH_SUFFIX}
    21 INSTALLS += target
     3DESTDIR = $$OUT_PWD/$$DEPTH/.
    224
    235!build_pass: {
     
    5436}
    5537
     38# All kinds of builds should have the console if possible
    5639win32 {
    5740        CONFIG(release, debug|release):CONFIG(qt):contains(QT, gui) {
     
    6346        }       
    6447}
     48os2 {
     49    CONFIG -= windows
     50    CONFIG *= console
     51}       
  • tests/process/process-async/process-async.pro

    r903 r904  
    1 DEPTH = ..
    2 include($$DEPTH/../common.pri)
    3 else:error("Cannot include $$DEPTH/../common.pri!")
     1DEPTH = ../..
     2include($$DEPTH/common.pri)
    43
    54QT = core gui
    6 CONFIG += console
    75
    8 SOURCES += process-async.cpp
     6SOURCES = process-async.cpp
  • tests/process/process.pro

    r903 r904  
    1 include(../common.pri)
    2 else:error("Cannot include ../common.pri!")
    3 
    41TEMPLATE = subdirs
    52SUBDIRS = process-async test
  • tests/process/test/test.pro

    r205 r904  
    1 DEPTH = ..
    2 include($$DEPTH/../common.pri)
    3 else:error("Cannot include $$DEPTH/../common.pri!")
     1DEPTH = ../..
     2include($$DEPTH/common.pri)
    43
    54QT =
    6 CONFIG += console
    75
    8 SOURCES += test.cpp
     6SOURCES = test.cpp
Note: See TracChangeset for help on using the changeset viewer.