diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-14 12:00:31 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-12 21:41:34 +0100 |
| commit | e4aec09c7b9c639542965207850fdc8a3d1fc841 (patch) | |
| tree | ba7fe5d0d3c2ebd84afa387ff0f4d673222c2ace /cmake | |
| parent | f32a1b4e54faa4441f11eebc4795b5897ffb33a5 (diff) | |
CMake: Re-regenerate configure-related files
Add the missing qt_cmdline.cmake files.
Fix the bundled assimp library.
Remove the stale configure.cmake in src/plugins/sceneparsers.
Remove unused features from src/core/configure.json.
Change-Id: Id2aa3a02a1c0118c97bd2a447bd23f332f4b5270
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindWrapQt3DAssimp.cmake (renamed from cmake/FindWrapAssimp.cmake) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cmake/FindWrapAssimp.cmake b/cmake/FindWrapQt3DAssimp.cmake index 594a81b65..40e6c686b 100644 --- a/cmake/FindWrapAssimp.cmake +++ b/cmake/FindWrapQt3DAssimp.cmake @@ -1,14 +1,14 @@ -if(TARGET WrapAssimp::WrapAssimp) - set(WrapAssimp_FOUND TRUE) +if(TARGET WrapQt3DAssimp::WrapQt3DAssimp) + set(WrapQt3DAssimp_FOUND TRUE) return() endif() -set(WrapAssimp_FOUND FALSE) +set(WrapQt3DAssimp_FOUND FALSE) -find_package(assimp ${WrapAssimp_FIND_VERSION} CONFIG QUIET) +find_package(assimp ${WrapQt3DAssimp_FIND_VERSION} CONFIG QUIET) if (assimp_FOUND AND TARGET assimp::assimp) - add_library(WrapAssimp::WrapAssimp INTERFACE IMPORTED) - target_link_libraries(WrapAssimp::WrapAssimp INTERFACE assimp::assimp) + add_library(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE IMPORTED) + target_link_libraries(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE assimp::assimp) # The Assimp configuration file is broken, and sets only the Release location, without advertising # that it's available via IMPORTED_CONFIGURATIONS. Thus when configuring with a different @@ -23,13 +23,13 @@ if (assimp_FOUND AND TARGET assimp::assimp) endif() endif() - set(WrapAssimp_FOUND TRUE) + set(WrapQt3DAssimp_FOUND TRUE) elseif(assimp_FOUND AND assimp_LIBRARIES AND assimp_INCLUDE_DIRS) - add_library(WrapAssimp::WrapAssimp INTERFACE IMPORTED) - target_link_libraries(WrapAssimp::WrapAssimp INTERFACE ${assimp_LIBRARIES}) - target_include_directories(WrapAssimp::WrapAssimp INTERFACE ${assimp_INCLUDE_DIRS}) - set(WrapAssimp_FOUND TRUE) + add_library(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE IMPORTED) + target_link_libraries(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE ${assimp_LIBRARIES}) + target_include_directories(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE ${assimp_INCLUDE_DIRS}) + set(WrapQt3DAssimp_FOUND TRUE) endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(WrapAssimp DEFAULT_MSG WrapAssimp_FOUND) +find_package_handle_standard_args(WrapQt3DAssimp DEFAULT_MSG WrapQt3DAssimp_FOUND) |