X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=f4325bf7dcfdb16928a53a1fc62559e3e3342fda;hp=547c7c126bf69c7558732091dbc6c6df5e22960e;hb=79c4a9c8a28765422075b77b0dca23cd248c4d18;hpb=bf9f12687c8d43422455cbdc27ec1cc5d4305149 diff --git a/CMakeLists.txt b/CMakeLists.txt index 547c7c12..f4325bf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,6 @@ set(pulseview_SOURCES pv/devices/hardwaredevice.cpp pv/devices/inputfile.cpp pv/devices/sessionfile.cpp - pv/dialogs/about.cpp pv/dialogs/connect.cpp pv/dialogs/inputoutputoptions.cpp pv/dialogs/settings.cpp @@ -295,7 +294,6 @@ set(pulseview_HEADERS pv/data/logic.hpp pv/data/logicsegment.hpp pv/data/signalbase.hpp - pv/dialogs/about.hpp pv/dialogs/connect.hpp pv/dialogs/inputoutputoptions.hpp pv/dialogs/settings.hpp @@ -343,10 +341,6 @@ set(pulseview_HEADERS pv/widgets/wellarray.hpp ) -set(pulseview_FORMS - pv/dialogs/about.ui -) - set(pulseview_RESOURCES pulseview.qrc ) @@ -393,14 +387,12 @@ endif() if(Qt5Core_FOUND) qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) - qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) else() # Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED. # https://bugreports.qt.io/browse/QTBUG-22829 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS} OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED) - qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) include(${QT_USE_FILE}) endif() @@ -484,14 +476,12 @@ if(ANDROID) add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} - ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) else() add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} - ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) endif()