MOD: remove submodule gflags and googletest

Author: git-hulk

.gitignore

@@ -41,3 +41,4 @@ cmake-build-debug
 kvrocks
 version.h
 Makefile.dep
+make_config.mk

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "external/glog"]
 	path = external/glog
 	url = https://github.com/google/glog.git
-[submodule "external/gflags"]
-	path = external/gflags
-	url = https://github.com/gflags/gflags.git
 [submodule "external/rocksdb"]
 	path = external/rocksdb
 	url = https://github.com/facebook/rocksdb.git
@@ -13,9 +10,6 @@
 [submodule "external/libevent"]
 	path = external/libevent
 	url = https://github.com/libevent/libevent.git
-[submodule "external/googletest"]
-	path = external/googletest
-	url = https://github.com/abseil/googletest.git
 [submodule "external/jemalloc"]
 	path = external/jemalloc
 	url = https://github.com/jemalloc/jemalloc.git

.travis.yml

@@ -36,8 +36,9 @@ jobs:
     - stage: test 
       name: Unit Tests 
       script:
-        - sudo apt-get install libsnappy-dev
-        - cd external/googletest && cmake CMakeLists.txt && sudo make install && cd - 
+        - sudo apt-get install tar libsnappy-dev
+        - wget https://github.com/google/googletest/archive/release-1.8.1.tar.gz && tar -zxvf release-1.8.1.tar.gz
+          && cd googletest-release-1.8.1/ && cmake CMakeLists.txt && make && sudo make install && cd -
         - make test
     - stage: test 
       name: Functional Tests

CMakeLists.txt

@@ -21,10 +21,6 @@ include(cmake/jemalloc.cmake)
 list(APPEND EXTERNAL_LIBS PRIVATE ${jemalloc_LIBRARIES})
 list(APPEND EXTERNAL_INCS PRIVATE ${jemalloc_INCLUDE_DIRS})
 
-include(cmake/gflags.cmake)
-list(APPEND EXTERNAL_LIBS PRIVATE ${gflags_LIBRARIES})
-list(APPEND EXTERNAL_INCS PRIVATE ${gflags_INCLUDE_DIRS})
-
 include(cmake/glog.cmake)
 list(APPEND EXTERNAL_LIBS PRIVATE ${glog_LIBRARIES})
 list(APPEND EXTERNAL_INCS PRIVATE ${glog_INCLUDE_DIRS})
@@ -41,9 +37,6 @@ include(cmake/libevent.cmake)
 list(APPEND EXTERNAL_LIBS PRIVATE ${libevent_LIBRARIES})
 list(APPEND EXTERNAL_INCS PRIVATE ${libevent_INCLUDE_DIRS})
 
-include(cmake/gtest.cmake)
-list(APPEND EXTERNAL_LIBS PRIVATE ${gtest_LIBRARIES})
-list(APPEND EXTERNAL_INCS PRIVATE ${gtest_INCLUDE_DIRS})
 # End dependences
 
 # Add git sha to version.h
@@ -61,7 +54,7 @@ if(ENBALE_ASAN)
     target_compile_options(kvrocks PRIVATE -fsanitize=address)
     target_link_libraries(kvrocks PRIVATE -fsanitize=address)
 endif()
-add_dependencies(kvrocks jemalloc libevent gflags glog snappy rocksdb gtest)
+add_dependencies(kvrocks jemalloc libevent glog snappy rocksdb)
 target_include_directories(kvrocks PRIVATE ${PROJECT_BINARY_DIR})
 target_include_directories(kvrocks ${EXTERNAL_INCS})
 find_package(Threads REQUIRED)
@@ -143,7 +136,7 @@ if(ENBALE_ASAN)
     target_compile_options(kvrocks2redis PRIVATE -fno-omit-frame-pointer -fsanitize=address)
     target_link_libraries(kvrocks2redis PRIVATE -fno-omit-frame-pointer -fsanitize=address)
 endif()
-add_dependencies(kvrocks2redis libevent gflags glog rocksdb gtest)
+add_dependencies(kvrocks2redis libevent glog rocksdb)
 target_include_directories(kvrocks2redis PRIVATE ${PROJECT_BINARY_DIR})
 target_include_directories(kvrocks2redis ${EXTERNAL_INCS})
 
@@ -289,9 +282,9 @@ add_executable(unittest
         tests/compact_test.cc
         tests/log_collector_test.cc)
 
-add_dependencies(unittest gflags glog rocksdb gtest)
+add_dependencies(unittest glog rocksdb)
 target_compile_features(unittest PRIVATE cxx_std_11)
-target_link_libraries(unittest ${EXTERNAL_LIBS})
+target_link_libraries(unittest ${EXTERNAL_LIBS} -lgtest)
 target_include_directories(unittest PRIVATE ${PROJECT_BINARY_DIR})
 target_include_directories(unittest ${EXTERNAL_INCS})
 target_include_directories(unittest PRIVATE src)

cmake/glog.cmake

@@ -1,6 +1,3 @@
-# glog depends on gflags
-include("cmake/gflags.cmake")
-
 if (NOT __GLOG_INCLUDED)
     set(__GLOG_INCLUDED TRUE)
     # build directory
@@ -16,7 +13,6 @@ if (NOT __GLOG_INCLUDED)
     set(GLOG_C_FLAGS "${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
 
     ExternalProject_Add(glog
-        DEPENDS gflags
         PREFIX ${glog_PREFIX}
         #GIT_REPOSITORY "https://github.com/google/glog"
         #GIT_TAG "v0.3.5"
@@ -31,9 +27,9 @@ if (NOT __GLOG_INCLUDED)
                    -DBUILD_NC_TESTS=OFF
                    -DBUILD_CONFIG_TESTS=OFF
                    -DINSTALL_HEADERS=ON
+                   -DWITH_GFLAGS=OFF
                    -DCMAKE_C_FLAGS=${GLOG_C_FLAGS}
                    -DCMAKE_CXX_FLAGS=${GLOG_CXX_FLAGS}
-                   -DCMAKE_PREFIX_PATH=${gflags_INSTALL}
         LOG_DOWNLOAD 1
         LOG_CONFIGURE 1
         LOG_INSTALL 1

cmake/rocksdb.cmake

@@ -13,7 +13,7 @@ if (NOT __ROCKSDB_INCLUDED)
   set(ROCKSDB_C_FLAGS "${CMAKE_C_FLAGS} ${ROCKSDB_EXTRA_COMPILER_FLAGS}")
   set(JEMALLOC_ROOT_DIR ${jemalloc_INSTALL})
   ExternalProject_Add(rocksdb
-      DEPENDS gflags jemalloc snappy
+      DEPENDS jemalloc snappy
       PREFIX ${rocksdb_PREFIX}
       #GIT_REPOSITORY "https://github.com/facebook/rocksdb"
       #GIT_TAG "v5.15.10"