X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=config%2FCMakeLists.txt;h=5b341fcd213d2235f700d6e1189807e17a3c7119;hb=f81ba7bfcdea39cdb382bb5d1f818e795b242b8e;hp=b230348c4d4d24817e6749c93d5e4ea96cb4f4e6;hpb=8bd3397985e442761ce6956b3ba2e126a2577c42;p=carl9170fw.git

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index b230348..5b341fc 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.4)
 
 project(config)
 
@@ -11,17 +11,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../include/generated")
 
-LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../extra")
-FIND_PACKAGE(GPERF REQUIRED) 
+BISON_TARGET(parser parser.y parser.tab.c COMPILE_FLAGS "-l -b parser -p yy -t")
+FLEX_TARGET(lexer lexer.l lexer.lex.c COMPILE_FLAGS "-Pyy -L")
 
-BISON_TARGET(zconf zconf.y zconf.tab.c COMPILE_FLAGS "-l -b zconf -p zconf")
-FLEX_TARGET(zconfscan zconf.l lex.zconf.c COMPILE_FLAGS "-Pzconf -L")
-GPERF_TARGET(zconfhash zconf.gperf zconf.hash.c)
+SET(parser_deps ${FLEX_lexer_OUTPUTS})
+SET_SOURCE_FILES_PROPERTIES(${BISON_parser_OUTPUTS}
+      PROPERTIES OBJECT_DEPENDS "${parser_deps}")
 
-SET(zconf_deps ${FLEX_zconfscan_OUTPUTS} ${GPERF_zconfhash_OUTPUTS})
-SET_SOURCE_FILES_PROPERTIES(${BISON_zconf_OUTPUTS}
-      PROPERTIES OBJECT_DEPENDS "${zconf_deps}")
-
-set(conf_src conf.c ${BISON_zconf_OUTPUTS}) 
+set(conf_src conf.c util.c symbol.c confdata.c expr.c preprocess.c ${BISON_parser_OUTPUTS} ${FLEX_lexer_OUTPUTS})
 
 add_executable(conf ${conf_src})