Change cmake to build libpg_query in build folder manually (instead of using Makefile)

Author: tcm-marcel

src/CMakeLists.txt

@@ -32,10 +32,7 @@ peloton_default_properties(peloton-proto)
 
 # --[ Libpg_query library
 
-add_custom_target(libpg_query ALL
-                  COMMAND ${CMAKE_MAKE_PROGRAM}
-                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/libpg_query/
-                  COMMENT "Original libpg makefile target")
+add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/libpg_query/ libpg_query.a)
 
 
 ##################################################################################
@@ -46,9 +43,8 @@ add_custom_target(libpg_query ALL
 peloton_pickup_peloton_sources(${PROJECT_SOURCE_DIR})
 
 add_library(peloton SHARED ${srcs})
-add_dependencies(peloton libpg_query)
-target_link_libraries(peloton ${Peloton_LINKER_LIBS}
-    ${PROJECT_SOURCE_DIR}/third_party/libpg_query/libpg_query.a)
+
+target_link_libraries(peloton PUBLIC ${Peloton_LINKER_LIBS} peloton-proto PRIVATE pg_query)
 
 peloton_default_properties(peloton)
 set_target_properties(peloton PROPERTIES

third_party/libpg_query/CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 2.8.7)
+
+# ---[ Peloton project
+project(pg_query CXX C)
+
+# this code imitates the Makefile in /third_party/libpg_query/
+file(GLOB_RECURSE pg_query_srcs ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
+list(REMOVE_ITEM pg_query_srcs
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/pg_query_fingerprint_defs.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/pg_query_fingerprint_conds.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/pg_query_json_defs.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/pg_query_json_conds.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/postgres/guc-file.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/postgres/scan.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/pg_query_json_helper.c")
+
+include_directories(.)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/postgres/include)
+
+add_library(pg_query STATIC ${pg_query_srcs})
+
+set_target_properties(pg_query PROPERTIES LINKER_LANGUAGE C)
+set_target_properties(pg_query PROPERTIES POSITION_INDEPENDENT_CODE ON)