moved sub-tests to separate dir

source/CMakeLists.txt

@@ -49,5 +49,4 @@ add_subdirectory(CheckableTest)
 add_subdirectory(CheckableTestModel)
 
 add_subdirectory(MetaData)
-add_subdirectory(VerbEnd)
+add_subdirectory(SubTests)
-add_subdirectory(Genus)

source/DataModel.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "MetaData/MetaDataModel.h"
-#include "Genus/GenusModel.h"
+#include "GenusModel.h"
-#include "VerbEnd/VerbEndModel.h"
+#include "VerbEndModel.h"
 
 #include <QJsonObject>
 

source/SubTests/CMakeLists.txt

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.6)
+
+add_subdirectory(VerbEnd)
+add_subdirectory(Genus)

source/SubTests/Genus/CMakeLists.txt

@@ -21,6 +21,8 @@ set_target_properties(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE
 		${CMAKE_CURRENT_BINARY_DIR}
 )

source/SubTests/VerbEnd/CMakeLists.txt

@@ -21,6 +21,8 @@ set_target_properties(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE
 		${CMAKE_CURRENT_BINARY_DIR}
 )

source/mainwindow.ui

@@ -160,13 +160,13 @@
   <customwidget>
    <class>GenusWidget</class>
    <extends>QWidget</extends>
-   <header>Genus/GenusWidget.h</header>
+   <header>GenusWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>VerbEndWidget</class>
    <extends>QWidget</extends>
-   <header>VerbEnd/VerbEndWidget.h</header>
+   <header>VerbEndWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>