diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt index f88c4a7..903d5a0 100644 --- a/QtCollider/CMakeLists.txt +++ b/QtCollider/CMakeLists.txt @@ -8,16 +8,15 @@ find_package(Qt5Network) find_package(Qt5WebKit) find_package(Qt5WebKitWidgets) find_package(Qt5PrintSupport) -find_package(Qt5Sensors) find_package(Qt5Quick) find_package(Qt5Qml) find_package(Qt5Sql) find_package(Qt5Positioning) -mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) +mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) set (QT_COLLIDER_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport - Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning + Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning ${MATH_LIBRARY}) if (APPLE) diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt index 860d254..dbe2ad7 100644 --- a/editors/sc-ide/CMakeLists.txt +++ b/editors/sc-ide/CMakeLists.txt @@ -11,13 +11,12 @@ find_package(Qt5Positioning) find_package(Qt5PrintSupport) find_package(Qt5Qml) find_package(Qt5Quick) -find_package(Qt5Sensors) find_package(Qt5Sql) find_package(Qt5WebKitWidgets) find_package(Qt5Widgets) set(QT_IDE_LIBRARIES - Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) + Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) if(${CMAKE_COMPILER_IS_GNUCXX}) add_definitions(-Wreorder) diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index fe52223..427c587 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -389,7 +389,7 @@ elseif(WIN32) SET(QT_PLUGINS_DIR "${QT_BIN_PATH}/../plugins" CACHE PATH "Location of qt plugins for windows") endif() - foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sensors_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS}) + foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS}) get_target_property(_loc ${plugin} LOCATION) get_filename_component(_parent_dir ${_loc} DIRECTORY) get_filename_component(_name_we ${_loc} NAME_WE)