feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Use Qt5::DesignerComponents

Browse Source 
QTBUG-75867 about missing Qt5::DesignerComponents support has been
fixed, so use that over our own hand-rolled version.

Change-Id: I6d8bb7f7d5359050f20a095adb4a074f143e8d49
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2020-03-24 14:44:28 +01:00
committed by Eike Ziller
parent 0e8f62d5f8
commit 2eb9e12b5d
3 changed files with 2 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -48,7 +48,8 @@ find_package(Qt5 COMPONENTS LinguistTools)
find_package(Threads)
find_package(Qt5 COMPONENTS Designer Help Script SerialPort Svg QUIET)
find_package(Qt5 COMPONENTS Designer DesignerComponents Help Script SerialPort Svg QUIET)
function (set_if_target var target)
if (TARGET "${target}")
set(_result ON)

69
cmake/FindDesignerComponents.cmake
View File

@@ -1,69 +0,0 @@
#.rst:
# FindDesignerComponents
# ---------
#
# Try to locate the DesignerComponents library.
# If found, this will define the following variables:
#
# ``DesignerComponents_FOUND``
# True if the DesignerComponents library is available
# ``DesignerComponents_INCLUDE_DIRS``
# The DesignerComponents include directories
# ``DesignerComponents_LIBRARIES``
# The DesignerComponentscore library for linking
# ``DesignerComponents_INSTALL_DIR``
# Top level DesignerComponents installation directory
#
# If ``DesignerComponents_FOUND`` is TRUE, it will also define the following
# imported target:
#
# ``Qt5::DesignerComponents``
# The DesignerComponents library
find_package(Qt5Designer QUIET)
if (NOT Qt5Designer_FOUND)
set(DesignerComponents_FOUND OFF)
return()
endif()
get_target_property(_designer_location Qt5::Designer IMPORTED_LOCATION_DEBUG)
if (NOT _designer_location)
get_target_property(_designer_location Qt5::Designer IMPORTED_LOCATION_RELEASE)
endif()
if (NOT _designer_location)
get_target_property(_designer_location Qt5::Designer IMPORTED_LOCATION)
endif()
get_target_property(_designer_is_framework Qt5::Designer FRAMEWORK)
find_library(DesignerComponents_LIBRARIES NAMES Qt5DesignerComponents QtDesignerComponents Qt5DesignerComponentsd QtDesignerComponentsd
HINTS "${_designer_location}/.." "${_designer_location}/../..")
if (_designer_is_framework)
if (DesignerComponents_LIBRARIES)
set(DesignerComponents_LIBRARIES "${DesignerComponents_LIBRARIES}/QtDesignerComponents")
endif()
else()
find_path(DesignerComponents_INCLUDE_DIRS NAMES qtdesignercomponentsversion.h PATH_SUFFIXES QtDesignerComponents HINTS ${Qt5Designer_INCLUDE_DIRS})
set(_required_vars Qt5Designer_INCLUDE_DIRS)
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DesignerComponents DEFAULT_MSG
DesignerComponents_LIBRARIES ${_required_vars})
if(DesignerComponents_FOUND AND NOT TARGET DesignerComponents::DesignerComponents)
add_library(Qt5::DesignerComponents UNKNOWN IMPORTED)
set_target_properties(Qt5::DesignerComponents PROPERTIES
IMPORTED_LOCATION "${DesignerComponents_LIBRARIES}")
if (NOT _designer_is_framework)
set_target_properties(Qt5::DesignerComponents PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${DesignerComponents_INCLUDE_DIRS}")
endif()
endif()
mark_as_advanced(DesignerComponents_INCLUDE_DIRS DesignerComponents_LIBRARIES)
include(FeatureSummary)
set_package_properties(DesignerComponents PROPERTIES
URL "https://qt.io/"
DESCRIPTION "Qt5 (Widget) DesignerComponents library")

3
src/plugins/designer/CMakeLists.txt
View File

@@ -1,6 +1,3 @@
# Qt5::DesignerComponents doesn't have a target, so we need to define our own:-/
find_package(DesignerComponents)
if (WITH_TESTS)
set(TST_COMPONENT CppEditor)
endif()