Commit Graph

14 Commits

Author SHA1 Message Date
Lucie Gérard 8f339ea3d0 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I97fa27f60a8546ea3d73cc7daf1b728c615a1ab0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-24 01:53:10 +02:00
Lucie Gérard 0802d82e08 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: I141f5077ae0c11e1058de64d573ca33e2a308ccd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-08 13:42:44 +02:00
Lucie Gérard 2f1bc82b35 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I8105424281eed871037fa6c463871ca8829876b5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-22 10:47:10 +02:00
Joerg Bornemann 6eec42344e Fix build on macOS if system assimp is installed
On macOS, if pkg-config is not used, we modify
CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH.  This must be
done in the configure tests too.  Otherwise the find_package commands
may return different things for configure tests and the Qt build itself.

In this case, assimp was picked up from brew in the configure test but
not in the Qt build.

Task-number: QTBUG-97076
Change-Id: Ib43ceebe78768267a60142c5a4235eab7ac18c81
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-10-08 20:34:06 +02:00
Alexandru Croitor 667dc7b345 CMake: Bump almost all cmake_minimum_required calls to 3.16
Needed for subsequent change that will check and error out if the
version is lower than 3.16. We do that to ensure all policies
introduced by CMake up to version 3.16 have their behavior set to
NEW.

Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: I29beb4b263c915d3ff5312a3b1ceb45e8fdc34e0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-09-22 19:37:01 +02:00
Mike Krus 22dd309499 Add support for building with CMake
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2020-05-22 08:53:50 +01:00
Mike Krus ad238237b7 Build Assimp using submodule
Use same submodule as QtQuick3D

Change-Id: I0c138d1cbf5ff545438a7673ccb71a2236729377
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2020-05-12 11:09:21 +01:00
Määttä Antti c8dc1b687b Add new version check to config.tests for assimp
Qt3D expects new version of assimp. Use new animation stuff to check new
version.

Task-number: QTBUG-59121
Change-Id: I3988beaab5b7dac825c67a225f785130be99aad6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-04-11 12:44:28 +00:00
Lars Knoll 2ab01d2813 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 <oswald.buddenhagen@qt.io>
2016-10-28 11:01:38 +00:00
Liang Qi 47f3704afc Adjust to qtConfig() changes in qtbase
Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-08-21 19:59:33 +00:00
Antti Kokko c96ed46fde Unify license header usage
Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one
(in those files which will be under GPL 3 with exceptions)

Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-26 11:43:08 +00:00
Oswald Buddenhagen 27c07d859a centralize + fix use of system assimp
follow the foo.pri & foo_dependency.pri pattern found in qtbase to
de-duplicate the code (and thus implicitly make it consistent) and
synchronize the conditionals in the configure test.

also document why we still can't enable the assimp sceneparser in all
configurations.

Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-14 15:46:35 +00:00
Mika Salmela df0bcb540c Copyright header change.
As for preparation for Qt5.5 release the copyright header is
updated to correspond the current license requirements.

Change-Id: I36632918b66f455539453b42c369689fb11298ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2015-02-09 15:45:15 +00:00
Paul Lemire 672b3e4729 Assimp external dependency
The AssimpParser is now a SceneParser plugin that is build if config tests for
assimp succeed.

Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-08-19 17:50:57 +02:00