From aa8db9af9493da19d053265033ad37f02418ce82 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 11 Jun 2023 19:03:07 +0200
Subject: [PATCH] fix qml path
---
plug.pro | 5 -----
src/GUI/CMakeLists.txt | 4 +++-
2 files changed, 3 insertions(+), 6 deletions(-)
delete mode 100644 plug.pro
diff --git a/plug.pro b/plug.pro
deleted file mode 100644
index be04603..0000000
--- a/plug.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-
-TEMPLATE = subdirs
-
-QMAKE_EXTRA_TARGETS += \
- test
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 5accef2..d5805a8 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -49,7 +49,9 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
-set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "" FORCE)
+if (NOT QML_IMPORT_PATH MATCHES "${CMAKE_CURRENT_SOURCE_DIR}")
+ set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "" FORCE)
+endif()
set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/doctorpill_gui_global.h")
configure_file("${global_file}.in" ${global_file} @ONLY)