From ccc1100443c554725972226a13286afdee347ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Busi?= Date: Wed, 9 Oct 2019 10:48:59 +0200 Subject: [PATCH 1/2] Remove python2 and ctypegens things that we don't need. --- CMakeLists.txt | 6 +----- python/CMakeLists.txt | 14 -------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 python/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a909bf..f7546cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,7 @@ INCLUDE(version) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -FIND_PACKAGE(PythonInterp 2) - -FIND_PROGRAM(CTYPESGEN_FOUND ctypesgen.py) +FIND_PACKAGE(PythonInterp 3) FIND_PACKAGE(BISON 3) FIND_PACKAGE(FLEX) @@ -102,8 +100,6 @@ GENERATE_AST_FILE(cxx_json_visitor_header JsonVisitor.h.inc) GENERATE_AST_FILE(cxx_json_visitor_impl JsonVisitor.cpp.inc) -ADD_SUBDIRECTORY(python) - OPTION(test "Build tests." OFF) INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c DESTINATION include/graphqlparser diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt deleted file mode 100644 index d812f45..0000000 --- a/python/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ - -IF (CTYPESGEN_FOUND) - ADD_CUSTOM_COMMAND( - OUTPUT GraphQLParser.py - COMMAND ctypesgen.py ${CMAKE_CURRENT_SOURCE_DIR}/../c/*.h ${CMAKE_CURRENT_BINARY_DIR}/../c/*.h -o ${CMAKE_CURRENT_SOURCE_DIR}/GraphQLParser.py -I ${CMAKE_CURRENT_SOURCE_DIR}/.. -I ${CMAKE_CURRENT_BINARY_DIR}/.. -l graphqlparser -L ${CMAKE_CURRENT_BINARY_DIR}/.. 2>&1 > /dev/null - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../c/GraphQLAstForEachConcreteType.h ${CMAKE_CURRENT_BINARY_DIR}/../c/GraphQLAst.h ${CMAKE_CURRENT_SOURCE_DIR}/../c/GraphQLAstNode.h ${CMAKE_CURRENT_SOURCE_DIR}/../c/GraphQLAstVisitor.h ${CMAKE_CURRENT_SOURCE_DIR}/../c/GraphQLParser.h - ) - ADD_CUSTOM_TARGET( - graphql-parser-python - ALL - DEPENDS GraphQLParser.py) -ELSE() - MESSAGE(WARNING "ctypesgen.py not found; install with pip or easy_install if you want to run pythontest.py.") -ENDIF() From 80e9b6ece532f54a283463603941522ce0a1b984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20=27Bubu=27=20Busi?= Date: Thu, 20 Feb 2020 14:54:12 +0100 Subject: [PATCH 2/2] Enable the lib to be build without bison and flex --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7546cd..ee58d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ ELSE() ${CMAKE_CURRENT_SOURCE_DIR}/parsergen/location.hh ${CMAKE_CURRENT_SOURCE_DIR}/parsergen/position.hh ${CMAKE_CURRENT_SOURCE_DIR}/parsergen/stack.hh - ${CMAKE_CURRENT_BINARY_DIR}) + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ENDIF() IF(FLEX_FOUND) @@ -43,7 +43,7 @@ ELSE() FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/parsergen/lexer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/parsergen/lexer.h - ${CMAKE_CURRENT_BINARY_DIR}) + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ENDIF() FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/c)