-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
5 changed files
with
43 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1 @@ | ||
SOURCES += main.cpp | ||
|
||
unix:qtConfig(pkg-config) { | ||
CONFIG += link_pkgconfig | ||
PKGCONFIG += assimp | ||
} else { | ||
LIBS += -lassimp | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"subconfigs": [ | ||
"src/core" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
requires(qtConfig(opengl)) | ||
|
||
load(configure) | ||
qtCompileTest(assimp) | ||
|
||
CONFIG += examples_need_tools | ||
load(qt_parts) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"module": "3dcore", | ||
"testDir": "../../config.tests", | ||
|
||
"libraries": { | ||
"assimp": { | ||
"label": "Assimp", | ||
"test": "assimp", | ||
"sources": [ | ||
{ "type": "pkgConfig", "args": "assimp" }, | ||
"-lassimp" | ||
] | ||
} | ||
}, | ||
|
||
"features": { | ||
"system-assimp": { | ||
"label": "System Assimp", | ||
"condition": "libs.assimp", | ||
"output": [ "privateFeature" ] | ||
} | ||
}, | ||
|
||
"report": [ | ||
], | ||
|
||
"summary": [ | ||
{ | ||
"section": "Qt 3D", | ||
"entries": [ | ||
"system-assimp" | ||
] | ||
} | ||
] | ||
} |