Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

8 files changed, 8 insertions, 35 deletions

diff --git a/3rdparty/QtPropertyBrowser/src/CMakeLists.txt b/3rdparty/QtPropertyBrowser/src/CMakeLists.txt
index ac70956d..a312a10d 100644
--- a/3rdparty/QtPropertyBrowser/src/CMakeLists.txt
+++ b/3rdparty/QtPropertyBrowser/src/CMakeLists.txt
@@ -16,9 +16,6 @@ set(_SRCS
   qtvariantproperty.cpp
   )
 
-file(GLOB _IMPL_HDRS *.h)
-file(GLOB _PUBLIC_HDRS Qt*)
-
 set(_UI_FORMS
   )
 
@@ -31,34 +28,10 @@ QT5_ADD_RESOURCES(_QRC_SRCS ${_RESOURCES})
 
 set(TARGET_NAME ${PROJECT_NAME})
 
-add_library(${TARGET_NAME}
+add_library(${TARGET_NAME} STATIC
   ${_SRCS}
   ${_UI_SRCS}
   ${_QRC_SRCS}
-  ${_IMPL_HDRS}
   )
 
 target_link_libraries(${TARGET_NAME} Qt5::Widgets)
-
-######################### Installation Stuff ###########################
-include(GenerateExportHeader)
-generate_export_header(${TARGET_NAME})
-
-install(TARGETS ${TARGET_NAME}
-  EXPORT ${TARGET_NAME}Targets
-  RUNTIME DESTINATION ${INSTALL_BIN_DIR}
-  LIBRARY DESTINATION ${INSTALL_LIB_DIR}
-  ARCHIVE DESTINATION ${INSTALL_LIB_DIR}
-  INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR}
-)
-
-install(
-  FILES
-    ${_PUBLIC_HDRS}
-    ${_IMPL_HDRS}
-  DESTINATION
-    ${INSTALL_INCLUDE_DIR}
-  COMPONENT
-    Devel
-)
-
diff --git a/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp
index f194c76a..58cfc510 100644
--- a/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp
@@ -626,4 +626,4 @@ bool QtButtonPropertyBrowser::isExpanded(QtBrowserItem *item) const
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtbuttonpropertybrowser.hpp"
+#include "moc_qtbuttonpropertybrowser.cpp"
diff --git a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
index e7f7241e..a2ef86c9 100644
--- a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
@@ -2575,5 +2575,5 @@ void QtFontEditorFactory::disconnectPropertyManager(QtFontPropertyManager *manag
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qteditorfactory.hpp"
+#include "moc_qteditorfactory.cpp"
 #include "qteditorfactory.moc"
diff --git a/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp
index 6e4d2490..caf074db 100644
--- a/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp
@@ -533,4 +533,4 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtgroupboxpropertybrowser.hpp"
+#include "moc_qtgroupboxpropertybrowser.cpp"
diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp
index 6ec09ac1..2449fcb8 100644
--- a/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp
@@ -2045,4 +2045,4 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtpropertybrowser.hpp"
+#include "moc_qtpropertybrowser.cpp"
diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp
index 6dea25a3..ef627e9c 100644
--- a/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp
@@ -6421,5 +6421,5 @@ void QtCursorPropertyManager::uninitializeProperty(QtProperty *property)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtpropertymanager.hpp"
+#include "moc_qtpropertymanager.cpp"
 #include "qtpropertymanager.moc"
diff --git a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
index 4e6f16a9..9e506af3 100644
--- a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp
@@ -1072,5 +1072,5 @@ void QtTreePropertyBrowser::editItem(QtBrowserItem *item)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qttreepropertybrowser.hpp"
+#include "moc_qttreepropertybrowser.cpp"
 #include "qttreepropertybrowser.moc"
diff --git a/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp b/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp
index 6145b2ab..c41730c8 100644
--- a/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp
@@ -2355,4 +2355,4 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtvariantproperty.hpp"
+#include "moc_qtvariantproperty.cpp"