forked from qt-creator/qt-creator
Fixes: get tests compiling again that depend on the cpp library
Details: This gets the tests running again, by statically linking them. qmake doesn't have support for depending upon other projects being built, so when the projects are built out of order, libCPlusPlusTest.so wasn't being built before trying to be linked against.
This commit is contained in:
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
|
|||||||
CONFIG += ordered
|
CONFIG += ordered
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
shared \
|
|
||||||
ast \
|
ast \
|
||||||
semantic \
|
semantic \
|
||||||
lookup \
|
lookup \
|
||||||
|
@@ -2,4 +2,4 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
|
|||||||
include(../../../../qtcreator.pri)
|
include(../../../../qtcreator.pri)
|
||||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
|
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
|
||||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
|
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
|
||||||
LIBS += -L$$OUT_PWD/../shared -lCPlusPlusTestSupport
|
include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)
|
||||||
|
@@ -1,5 +0,0 @@
|
|||||||
TEMPLATE = lib
|
|
||||||
TARGET = CPlusPlusTestSupport
|
|
||||||
CONFIG += static depend_includepath
|
|
||||||
QT = core gui
|
|
||||||
include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)
|
|
Reference in New Issue
Block a user