-
The change in b14b14e9 added a module prefix to quick3d's assimp feature and libraries, but hasn't adapted the equivalent CMake projects. Perhaps because the CMake project didn't exist in the dev branch then. Do the necessary changes to bring both the qmake and CMake build in sync. The requirements for that are: - rename the config.tests/assimp test to match the name of the library, that is needed for configurejson2cmake to properly pick up the config.test - rename the library to use underscores instead of dashes and adjust usages of it in the .pro files - add the module prefix to the FindWrap script, its usages and the targets it creates - add missing qt_cmdline.cmake files Amends 64f7a55f Amends b14b14e9 Change-Id: I24518082a125d73d6bc6896f494eb0d0abfa05be Reviewed-by:
Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Inho Lee <inho.lee@qt.io>The change in b14b14e9 added a module prefix to quick3d's assimp feature and libraries, but hasn't adapted the equivalent CMake projects. Perhaps because the CMake project didn't exist in the dev branch then. Do the necessary changes to bring both the qmake and CMake build in sync. The requirements for that are: - rename the config.tests/assimp test to match the name of the library, that is needed for configurejson2cmake to properly pick up the config.test - rename the library to use underscores instead of dashes and adjust usages of it in the .pro files - add the module prefix to the FindWrap script, its usages and the targets it creates - add missing qt_cmdline.cmake files Amends 64f7a55f Amends b14b14e9 Change-Id: I24518082a125d73d6bc6896f494eb0d0abfa05be Reviewed-by:
Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Inho Lee <inho.lee@qt.io>