fix cmake2 build error

Author: mengborong

README.md

@@ -56,7 +56,7 @@ We extend a tool named pgxc_ctl from PG-XC/PG-XL open-source project to support
 * install dependent packages (use Centos as an example)
 
 ```bash
-sudo yum install libzstd-devel libzstd zstd cmake openssl-devel protobuf-devel readline-devel libxml2-devel libxslt-devel zlib-devel bzip2-devel lz4-devel snappy-devel
+sudo yum install bison flex libzstd-devel libzstd zstd cmake openssl-devel protobuf-devel readline-devel libxml2-devel libxslt-devel zlib-devel bzip2-devel lz4-devel snappy-devel
 ```
 * set up ssh login without password
 

build.sh

@@ -61,9 +61,9 @@ fi
 # build polardb consensus dynamic library
 cd $CODEHOME/src/backend/polar_dma/libconsensus/polar_wrapper
 if [[ "$BLD_OPT" == "debug" ]]; then
-sh ./build.sh -r -t debug
+bash ./build.sh -r -t debug
 else
-sh ./build.sh -r -t release
+bash ./build.sh -r -t release
 fi
 cd $CODEHOME
 

src/backend/polar_dma/libconsensus/consensus/CMakeLists.txt

@@ -78,7 +78,7 @@ ELSE()
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g -Wall -O3 -fPIC ")
 ENDIF()
 
-INCLUDE_DIRECTORIES (include
+include_directories(include
   ${CMAKE_INSTALL_PREFIX}/include/easy
   ${CMAKE_CURRENT_SOURCE_DIR}/include/
   ${CMAKE_CURRENT_SOURCE_DIR}/../dependency/easy/src/io/
@@ -119,22 +119,23 @@ link_directories(
   ${CMAKE_INSTALL_PREFIX}/lib
   )
 
-find_package(Protobuf)
+find_package(Protobuf REQUIRED)
 SET (PROTOBUF_CPP ${CMAKE_CURRENT_SOURCE_DIR}/consensus/protocol/paxos.pb.c ${CMAKE_CURRENT_SOURCE_DIR}/consensus/protocol/paxos.pb.h)
 add_custom_command (
   OUTPUT ${PROTOBUF_CPP}
   COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/protocol &&
-  (${Protobuf_PROTOC_EXECUTABLE} -I. --cpp_out=. paxos.proto)
+  (${PROTOBUF_PROTOC_EXECUTABLE} -I. --cpp_out=. paxos.proto)
   COMMENT "generage protobuf cpp"
 )
 add_custom_target (paxos_pb
   ALL DEPENDS ${PROTOBUF_CPP}
 )
-INCLUDE_DIRECTORIES(${Protobuf_INCLUDE_DIRS})
-ADD_LIBRARY (aliconsensus STATIC ${AC_SRC})
-TARGET_LINK_LIBRARIES (aliconsensus pthread snappy z
+include_directories(${Protobuf_INCLUDE_DIRS})
+add_definitions(-w)
+add_library(aliconsensus STATIC ${AC_SRC})
+target_link_libraries(aliconsensus pthread snappy z
   	bz2 lz4 rt ssl crypto myeasy ${PROTOBUF_LIBRARIES} ${EXTRA_LINK})
-ADD_DEPENDENCIES(aliconsensus paxos_pb)
+add_dependencies(aliconsensus paxos_pb)
 
 install(TARGETS aliconsensus DESTINATION lib)
 install(FILES ${INC_FILE} DESTINATION include/aliconsensus)

src/backend/polar_dma/libconsensus/consensus/build.sh

@@ -3,6 +3,8 @@
 # Script for Dev's daily work.  It is a good idea to use the exact same
 # build options as the released version.
 
+set -e
+
 get_key_value()
 {
   echo "$1" | sed 's/^--[a-zA-Z_-]*=//'
@@ -89,22 +91,21 @@ else
 fi
 
 CWD="`pwd`"
-if [[ "${install_dir:0:1}" == "/" ]]
-then
+if [[ "${install_dir:0:1}" == "/" ]]; then
 dest_dir=$install_dir
 else
 dest_dir=$CWD"/"$install_dir
 fi
 
 if [ ! -d bu ];then
-mkdir bu 
+mkdir bu
 fi
 cd bu
 
 # modify this cmake script for you own needs
 cmake -D CMAKE_INSTALL_PREFIX=$dest_dir -D WITH_DEBUG=$debug -D WITHOUT_CXX11_ABI=$without_cxx11_abi -D WITH_TSAN=OFF -D WITH_ASAN=$with_asan ..
-make libmyeasy -j
+make libmyeasy -sj
 cd ../protocol
 cd ../bu
-make -j
+make -sj
 make install

src/backend/polar_dma/libconsensus/dependency/easy/src/CMakeLists.txt

@@ -81,6 +81,7 @@ message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
 
 INCLUDE_DIRECTORIES (${OPENSSL_INCLUDE_DIR} include io packet thread util packet/http)
 
+add_definitions(-w)
 add_library (myeasy STATIC ${PRJ_SRC})
 TARGET_LINK_LIBRARIES (myeasy ev ${OPENSSL_LIBRARIES})
 

src/backend/polar_dma/libconsensus/polar_wrapper/CMakeLists.txt

@@ -43,7 +43,7 @@ ENDIF()
 
 find_package(Protobuf REQUIRED)
 INCLUDE_DIRECTORIES(${Protobuf_INCLUDE_DIRS})
-link_directories(${Protobuf_LIBRARIES})
+LINK_DIRECTORIES(${Protobuf_LIBRARIES})
 
 INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -54,6 +54,7 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
   )
 
+ADD_DEFINITIONS(-w)
 ADD_LIBRARY (polar_consensus_wrapper SHARED ${AC_SRC})
 TARGET_LINK_LIBRARIES (polar_consensus_wrapper protobuf ${EXTRA_LINK})
 
@@ -63,6 +64,6 @@ TARGET_LINK_LIBRARIES (polar_consensus_wrapper
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/libaliconsensus.a
   "-Wl,--no-whole-archive" ${EXTRA_LINK})
 
-install(TARGETS polar_consensus_wrapper DESTINATION lib)
-install(FILES ${INC_FILE} DESTINATION include)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/easy DESTINATION include)
+INSTALL(TARGETS polar_consensus_wrapper DESTINATION lib)
+INSTALL(FILES ${INC_FILE} DESTINATION include)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/easy DESTINATION include)

src/backend/polar_dma/libconsensus/polar_wrapper/build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 usage()
 {
 cat <<EOF
@@ -68,7 +70,7 @@ fi
 CWD="`pwd`"
 cd ../consensus
 xpaxos_dest_dir=$CWD
-sh -x ./build.sh -t $build_type -a $with_asan -c $without_cxx11_abi -d $xpaxos_dest_dir
+bash ./build.sh -t $build_type -a $with_asan -c $without_cxx11_abi -d $xpaxos_dest_dir
 cd "${CWD}" 
 
 if [ x"$build_type" = x"debug" ]; then
@@ -84,5 +86,5 @@ rm -rf bu
 mkdir bu && cd bu
 
 cmake -D CMAKE_INSTALL_PREFIX=../../../ -D WITH_DEBUG=$debug -D WITHOUT_CXX11_ABI=$without_cxx11_abi -D WITH_ASAN=$with_asan ..
-make -j
+make -sj
 make install