diff options
| author | Li Xinwei <1326710505@qq.com> | 2021-08-02 18:16:38 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-03 07:17:07 +0000 |
| commit | e3020055618b48b8427e570b2762a62d877687c5 (patch) | |
| tree | 7439d53eabb4e6c41fc75f22c70c9962c7a942a7 /qmake | |
| parent | a546d0eef5b89869d2198628b4c359f1ec03f201 (diff) | |
Avoid to call _qt_internal_set_up_static_runtime_library() twice
Change-Id: I28985470b3e0b88befbbd2d62a027670d7d6c822
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a25144394910d07d0819c4da5aae058b0912a312)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index d35d981c99..1ad10b950e 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### # The common object library, that should be available regardless of the presence of qmake. -add_library(QtLibraryInfo OBJECT +qt_add_library(QtLibraryInfo OBJECT library/proitems.cpp library/proitems.h library/qmake_global.h property.cpp property.h @@ -42,7 +42,6 @@ target_compile_definitions(QtLibraryInfo PUBLIC QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}" QT_HOST_DATADIR="${hostdatadir}" ) -qt_set_common_target_properties(QtLibraryInfo) # qmake is out of any module, so we manually evaluate the required features. include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake") |