From 2ab01d2813c8823877019ea41349d037e5c29024 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 25 Oct 2016 15:55:07 +0200 Subject: Convert qt3d to the new configure system Remove some duplicated code between the assimp test and assimp_dependency.pri and do all pkg-config related tests during config time. Change-Id: If97c4cf53cd0356e7ee4e618a8d645ea697b3dfc Reviewed-by: Oswald Buddenhagen --- src/3rdparty/assimp/assimp_dependency.pri | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri index f1a109f10..8ba2d9a41 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,11 +1,6 @@ -config_assimp:!if(cross_compile:host_build) { - unix:qtConfig(pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG_PRIVATE += assimp - } else { - LIBS += -lassimp - } - return() +QT_FOR_CONFIG += 3dcore-private +qtConfig(system-assimp):!if(cross_compile:host_build) { + QMAKE_USE_PRIVATE += assimp } else { include(assimp.pri) } -- cgit v1.2.1