1 files changed, 3 insertions, 3 deletions
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 552526d..4f78eb8 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (generator)
 find_package(PkgConfig)
 pkg_check_modules(sqlite3 sqlite3 REQUIRED)
 find_package(libxml2 REQUIRED)
-include_directories(${sqlite3_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ../vendor/json/src)
+include_directories(${sqlite3_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ../vendor/json)
-add_executable(generator generator.cpp)
+add_executable(generator notion.cpp word.cpp lemma.cpp form.cpp pronunciation.cpp group.cpp frame.cpp part.cpp selrestr.cpp database.cpp field.cpp generator.cpp main.cpp)
 set_property(TARGET generator PROPERTY CXX_STANDARD 11)
 set_property(TARGET generator PROPERTY CXX_STANDARD_REQUIRED ON)
 target_link_libraries(generator ${sqlite3_LIBRARIES} ${LIBXML2_LIBRARIES})

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 552526d..4f78eb8 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt
@@ -1,12 +1,12 @@
1	cmake_minimum_required (VERSION 2.6)	1	cmake_minimum_required (VERSION 3.1)
2	project (generator)	2	project (generator)
3		3
4	find_package(PkgConfig)	4	find_package(PkgConfig)
5	pkg_check_modules(sqlite3 sqlite3 REQUIRED)	5	pkg_check_modules(sqlite3 sqlite3 REQUIRED)
6	find_package(libxml2 REQUIRED)	6	find_package(libxml2 REQUIRED)
7		7
8	include_directories(${sqlite3_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ../vendor/json/src)	8	include_directories(${sqlite3_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ../vendor/json)
9	add_executable(generator generator.cpp)	9	add_executable(generator notion.cpp word.cpp lemma.cpp form.cpp pronunciation.cpp group.cpp frame.cpp part.cpp selrestr.cpp database.cpp field.cpp generator.cpp main.cpp)
10	set_property(TARGET generator PROPERTY CXX_STANDARD 11)	10	set_property(TARGET generator PROPERTY CXX_STANDARD 11)
11	set_property(TARGET generator PROPERTY CXX_STANDARD_REQUIRED ON)	11	set_property(TARGET generator PROPERTY CXX_STANDARD_REQUIRED ON)
12	target_link_libraries(generator ${sqlite3_LIBRARIES} ${LIBXML2_LIBRARIES})	12	target_link_libraries(generator ${sqlite3_LIBRARIES} ${LIBXML2_LIBRARIES})