CMakeLists.txt

@@ -37,14 +37,14 @@ qt_standard_project_setup()
 qt_add_executable(${PROJECT_NAME}
     src/main.cpp
     src/DRAWer_2_0.cpp
-    src/DRAWer_2_0.ui
     src/Canvas.cpp
     include/DRAWer_2_0.h
     include/Canvas.h
+    forms/DRAWer_2_0.ui
 )
 
 # Добавляем путь к src/ для поиска .ui файла (обходит AutoUic ошибку)
-set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/forms)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/include

include/System.h

@@ -5,8 +5,8 @@
 #define CURVE_AS_CIRCLE(CURVE) dynamic_cast<Circle*>(CURVE)
 
 // GCS — геометрический солвер из FreeCAD
-#include "GCS/Geo.h"
-#include "GCS/GCS.h"
+#include "Geo.h"
+#include "GCS.h"
 using namespace GCS;
 
 /// Удобный тип для хранения пары линий (порядок не важен)