ci/kuiper: arm specific fixes regarding plugins path, translations pa…

…th, decoders path and required Python components Signed-off-by: Bindea Cristian <[email protected]>
analogdevicesinc · Apr 10, 2024 · cfed54f · cfed54f
1 parent bed58e2
commit cfed54f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/common/src/scopyconfig.cpp b/common/src/scopyconfig.cpp
@@ -25,6 +25,8 @@ QString scopy::config::localPluginFolderPath()
 
 #if defined __APPLE__
 	return QCoreApplication::applicationDirPath() + "/plugins/plugins";
+#elif defined(__ARM_ARCH_6__)
+	return QCoreApplication::applicationDirPath() + "/../share/plugins";
 #endif
 
 	return SCOPY_PLUGIN_BUILD_PATH;
@@ -36,6 +38,8 @@ QString scopy::config::localTranslationFolderPath()
 {
 #if defined __APPLE__
 	return QCoreApplication::applicationDirPath() + "/translations";
+#elif defined(__ARM_ARCH_6__)
+	return QCoreApplication::applicationDirPath() + "/../share/plugins";
 #endif
 
 	return SCOPY_TRANSLATION_BUILD_PATH;

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -34,7 +34,11 @@ endif()
 option(WITH_PYTHON "Enable Python" ON)
 if(${WITH_PYTHON})
 	set(Python_ADDITIONAL_VERSIONS 3)
-	find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+	if(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
+		find_package(Python3 REQUIRED COMPONENTS Interpreter)
+	else()
+		find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+	endif()
 	set(PYTHON_VERSION python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
 	set(PYTHON_VERSION ${PYTHON_VERSION} PARENT_SCOPE)
 	if(NOT Python3_FOUND)

diff --git a/core/src/scopymainwindow.cpp b/core/src/scopymainwindow.cpp
@@ -437,6 +437,8 @@ void ScopyMainWindow::loadDecoders()
 #if defined(WITH_SIGROK) && defined(WITH_PYTHON)
 #if defined __APPLE__
 	QString path = QCoreApplication::applicationDirPath() + "/decoders";
+#elif defined(__ARM_ARCH_6__)
+	QString path = QCoreApplication::applicationDirPath() + "/../share/plugins";
 #else
 	QString path = "decoders";
 #endif