Support catkin and catkin_simple

Signed-off-by: Kunlin Yu <yukunlin@syriusrobotics.com>

Author: kunlinyu

CMakeLists.txt

@@ -7,9 +7,16 @@ project(cql2cpp
 )
 add_definitions(-DCQL2CPP_VERSION="${PROJECT_VERSION}")
 
+
+find_package(catkin QUIET)
+find_package(catkin_simple QUIET)
+if (catkin_simple_FOUND)
+  catkin_package()
+  catkin_simple()
+endif()
+
 find_package(SQLite3 QUIET)
 find_package(libspatialite QUIET)
-
 if (SQLite3_FOUND AND libspatialite_FOUND)
   set(SQLITE_LIBS SQLite::SQLite3 libspatialite::libspatialite)
 else()
@@ -22,12 +29,6 @@ find_package(glog REQUIRED)
 
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
-install(DIRECTORY
-  ${CMAKE_SOURCE_DIR}/include/cql2cpp
-  ${CMAKE_SOURCE_DIR}/include/argparse
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
-)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -44,12 +45,18 @@ add_custom_command(
 
 # Parser
 set(BISON_FILE ${CMAKE_SOURCE_DIR}/src/cql2_parser.y)
-set(BISON_OUTPUT ${CMAKE_BINARY_DIR}/cql2_parser_base.cc)
+set(BISON_OUTPUT_HH ${CMAKE_BINARY_DIR}/cql2cpp/cql2_parser_base.hh)
+set(BISON_OUTPUT_CC ${CMAKE_BINARY_DIR}/cql2cpp/cql2_parser_base.cc)
 add_custom_command(
-  OUTPUT ${BISON_OUTPUT}
-  COMMAND bison -v -d -o ${BISON_OUTPUT} ${BISON_FILE} -W -Wcounterexamples
+  OUTPUT ${BISON_OUTPUT_CC}
+  COMMAND mkdir -p ${CMAKE_BINARY_DIR}/cql2cpp && bison -v --header=${BISON_OUTPUT_HH} --output=${BISON_OUTPUT_CC} ${BISON_FILE} -W -Wcounterexamples
   DEPENDS ${BISON_FILE}
-  COMMENT "Generating ${BISON_OUTPUT} from ${BISON_FILE} using bison"
+  COMMENT "Generating ${BISON_OUTPUT_CC} from ${BISON_FILE} using bison"
+)
+install(DIRECTORY
+  ${CMAKE_BINARY_DIR}/cql2cpp
+  DESTINATION include
+  FILES_MATCHING PATTERN "*.hh"
 )
 
 add_definitions(-DUSE_UNSTABLE_GEOS_CPP_API)
@@ -60,20 +67,26 @@ set(CQL2CPP_SRC
   src/global_yylex.cc
   src/value.cc
   ${FLEX_OUTPUT}
-  ${BISON_OUTPUT}
+  ${BISON_OUTPUT_CC}
 )
 
 # library
-add_library(cql2cpp ${CQL2CPP_SRC})
+if (catkin_simple_FOUND)
+  cs_add_library(cql2cpp ${CQL2CPP_SRC})
+else()
+  add_library(cql2cpp ${CQL2CPP_SRC})
+endif()
 target_compile_options(cql2cpp PRIVATE -Wno-register -Wno-write-strings)
 target_link_libraries(cql2cpp GEOS::geos glog::glog)
-install(TARGETS cql2cpp LIBRARY DESTINATION lib/)
 
 # CLI tool
-add_executable(cql2 src/main.cc)
+if (catkin_simple_FOUND)
+  cs_add_executable(cql2 src/main.cc)
+else()
+  add_executable(cql2 src/main.cc)
+endif()
 target_compile_options(cql2 PRIVATE -Wno-register -Wno-write-strings)
 target_link_libraries(cql2 cql2cpp GEOS::geos glog::glog)
-install(TARGETS cql2 RUNTIME DESTINATION lib/${PROJECT_NAME}/)
 
 # Test
 enable_testing()
@@ -90,3 +103,18 @@ add_test(NAME test_bbox_reader COMMAND test_bbox_reader WORKING_DIRECTORY ${TEST
 add_executable(test_sql ${TEST_DIR}/test_sql.cc)
 target_link_libraries(test_sql cql2cpp GTest::GTest GTest::Main glog::glog ${SQLITE_LIBS})
 add_test(NAME test_sql COMMAND test_sql WORKING_DIRECTORY ${TEST_DIR})
+
+
+if (catkin_simple_FOUND)
+  cs_install()
+  cs_export()
+else()
+  install(DIRECTORY
+    ${CMAKE_SOURCE_DIR}/include/cql2cpp
+    ${CMAKE_SOURCE_DIR}/include/argparse
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+  )
+  install(TARGETS cql2cpp LIBRARY DESTINATION lib/)
+  install(TARGETS cql2 RUNTIME DESTINATION lib/${PROJECT_NAME}/)
+endif()

include/cql2cpp/cql2_lexer-internal.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <cql2_parser_base.hh>
+#include <cql2cpp/cql2_parser_base.hh>
 #include <istream>
 #include <ostream>
 

include/cql2cpp/cql2_parser_text.h

@@ -13,7 +13,7 @@
 #include <FlexLexer.h>
 #include <glog/logging.h>
 
-#include <cql2_parser_base.hh>
+#include <cql2cpp/cql2_parser_base.hh>
 
 namespace cql2cpp {
 

include/cql2cpp/global_yylex.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <cql2_parser_base.hh>
+#include <cql2cpp/cql2_parser_base.hh>
 
 enum LexerInstance {
   CQL2_TEXT,

package.xml

@@ -10,5 +10,6 @@
   <license>MIT</license>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend>catkin_simple</buildtool_depend>
 </package>
 

src/cql2_lexer.l

@@ -1,5 +1,5 @@
 %{
-#include <cql2_parser_base.hh>
+#include <cql2cpp/cql2_parser_base.hh>
 #include <cql2cpp/cql2_lexer-internal.h>
 
 using cql2cpp::Cql2ParserBase;