add build from contrib source flag

fa214559 · yihaoDeng · 92249d89 · fa214559 · fa214559 · fa214559
隐藏空白更改
内联并排

Showing with 149 addition and 89 deletion

cmake/cmake.options cmake/cmake.options +6 -0

cmake/rocksdb_CMakeLists.txt.in cmake/rocksdb_CMakeLists.txt.in +27 -14

contrib/CMakeLists.txt contrib/CMakeLists.txt +116 -75

未找到文件。
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -189,3 +189,9 @@ option(
   "If build release version"
   OFF
 )
+option(
+   BUILD_CONTRIB
+   "If build thirdpart from source"
+   OFF
+)
--- a/cmake/rocksdb_CMakeLists.txt.in
+++ b/cmake/rocksdb_CMakeLists.txt.in
 # rocksdb
-IF (NOT ${TD_LINUX})
+if (${BUILD_CONTRIB})
+        ExternalProject_Add(rocksdb
-ExternalProject_Add(rocksdb
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
-	URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
-  	URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
-  	DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
-	DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
+	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
-	SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
+            CONFIGURE_COMMAND ""
-    CONFIGURE_COMMAND ""
+            BUILD_COMMAND ""
-    BUILD_COMMAND ""
+            INSTALL_COMMAND ""
-    INSTALL_COMMAND ""
+            TEST_COMMAND ""
-    TEST_COMMAND ""
+        )
-    )
+else()
-ENDIF(NOT ${TD_LINUX})
+    if (NOT ${TD_LINUX})
+        ExternalProject_Add(rocksdb
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
+	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
+            CONFIGURE_COMMAND ""
+            BUILD_COMMAND ""
+            INSTALL_COMMAND ""
+            TEST_COMMAND ""
+        )
+    endif()
+endif()
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -77,19 +77,25 @@ if(${BUILD_WITH_LEVELDB})
    cat("${TD_SUPPORT_DIR}/leveldb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif(${BUILD_WITH_LEVELDB})
-# rocksdb
-IF (NOT ${TD_LINUX})
+if (${BUILD_CONTRIB})
-if(${BUILD_WITH_ROCKSDB})
+    if(${BUILD_WITH_ROCKSDB})
-    cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+        cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    add_definitions(-DUSE_ROCKSDB)
+        add_definitions(-DUSE_ROCKSDB)
-endif(${BUILD_WITH_ROCKSDB})
+    endif()
-ELSE()
+else() 
-if(${BUILD_WITH_ROCKSDB})
+    if (NOT ${TD_LINUX})
-    #cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+        if(${BUILD_WITH_ROCKSDB})
-    add_definitions(-DUSE_ROCKSDB)
+            cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(${BUILD_WITH_ROCKSDB})
+            add_definitions(-DUSE_ROCKSDB)
+        endif(${BUILD_WITH_ROCKSDB})
-ENDIF(NOT ${TD_LINUX})
+    else()
+        if(${BUILD_WITH_ROCKSDB})
+            add_definitions(-DUSE_ROCKSDB)
+        endif(${BUILD_WITH_ROCKSDB})
+    endif()
+endif()
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
@@ -245,68 +251,103 @@ if (${BUILD_WITH_UV})
    endif(${TD_LINUX})
 endif (${BUILD_WITH_UV})
-IF (NOT ${TD_LINUX})
+if (${BUILD_WITH_ROCKSDB})
-if(${BUILD_WITH_ROCKSDB})
+    if (${BUILD_CONTRIB})
-    if(${TD_LINUX})
+        if(${TD_LINUX})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
-        IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+            if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-            SET(CMAKE_BUILD_TYPE Release)
+                SET(CMAKE_BUILD_TYPE Release)
-        endif()
+            endif()
-    endif(${TD_LINUX})
+        endif(${TD_LINUX})
-    MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
+        MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
-    if(${TD_DARWIN})
+        if(${TD_DARWIN})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
-    endif(${TD_DARWIN})
+        endif(${TD_DARWIN})
-    if (${TD_DARWIN_ARM64})
+        if (${TD_DARWIN_ARM64})
-        set(HAS_ARMV8_CRC true)
+            set(HAS_ARMV8_CRC true)
-    endif(${TD_DARWIN_ARM64})
+        endif(${TD_DARWIN_ARM64})
-    if (${TD_WINDOWS})
+        if (${TD_WINDOWS})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
-    endif(${TD_WINDOWS})
+            option(WITH_JNI "" OFF)
+            option(WITH_MD_LIBRARY "build with MD" OFF)
+            set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
-    if(${TD_DARWIN})
+        endif(${TD_WINDOWS})
-        option(HAVE_THREAD_LOCAL "" OFF)
-        option(WITH_IOSTATS_CONTEXT "" OFF)
-        option(WITH_PERF_CONTEXT "" OFF)
+        if(${TD_DARWIN})
-    endif(${TD_DARWIN})
+            option(HAVE_THREAD_LOCAL "" OFF)
+            option(WITH_IOSTATS_CONTEXT "" OFF)
-    if(${TD_WINDOWS})
+            option(WITH_PERF_CONTEXT "" OFF)
-        option(WITH_JNI "" OFF)
+        endif(${TD_DARWIN})
-    endif(${TD_WINDOWS})
+        option(WITH_FALLOCATE "" OFF)
-    if(${TD_WINDOWS})
+        option(WITH_JEMALLOC "" OFF)
-        option(WITH_MD_LIBRARY "build with MD" OFF)
+        option(WITH_GFLAGS "" OFF)
-        set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+        option(PORTABLE "" ON)
-    endif(${TD_WINDOWS})
+        option(WITH_LIBURING "" OFF)
+        option(FAIL_ON_WARNINGS OFF)
-    option(WITH_FALLOCATE "" OFF)
+        option(WITH_TESTS "" OFF)
-    option(WITH_JEMALLOC "" OFF)
+        option(WITH_BENCHMARK_TOOLS "" OFF)
-    option(WITH_GFLAGS "" OFF)
+        option(WITH_TOOLS "" OFF)
-    option(PORTABLE "" ON)
+        option(WITH_LIBURING "" OFF)
-    option(WITH_LIBURING "" OFF)
-    option(FAIL_ON_WARNINGS OFF)
+        option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+        add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
-    option(WITH_TESTS "" OFF)
+        target_include_directories(
-    option(WITH_BENCHMARK_TOOLS "" OFF)
+            rocksdb
-    option(WITH_TOOLS "" OFF)
+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
-    option(WITH_LIBURING "" OFF)
+        )
-    IF (TD_LINUX)
+    else() 
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+        if (NOT ${TD_LINUX})
-    ELSE()
+            MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+            if(${TD_DARWIN})
-    ENDIF()
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
-    add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
+            endif(${TD_DARWIN})
-    target_include_directories(
-        rocksdb
+            if (${TD_DARWIN_ARM64})
-        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
+                set(HAS_ARMV8_CRC true)
-    )
+            endif(${TD_DARWIN_ARM64})
-endif(${BUILD_WITH_ROCKSDB})
-ENDIF (NOT ${TD_LINUX})
+            if (${TD_WINDOWS})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+                option(WITH_JNI "" OFF)
+                option(WITH_MD_LIBRARY "build with MD" OFF)
+                set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+            endif(${TD_WINDOWS})
+            if(${TD_DARWIN})
+                option(HAVE_THREAD_LOCAL "" OFF)
+                option(WITH_IOSTATS_CONTEXT "" OFF)
+                option(WITH_PERF_CONTEXT "" OFF)
+            endif(${TD_DARWIN})
+            option(WITH_FALLOCATE "" OFF)
+            option(WITH_JEMALLOC "" OFF)
+            option(WITH_GFLAGS "" OFF)
+            option(PORTABLE "" ON)
+            option(WITH_LIBURING "" OFF)
+            option(FAIL_ON_WARNINGS OFF)
+            option(WITH_TESTS "" OFF)
+            option(WITH_BENCHMARK_TOOLS "" OFF)
+            option(WITH_TOOLS "" OFF)
+            option(WITH_LIBURING "" OFF)
+            option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+            add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
+            target_include_directories(
+                rocksdb
+                PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
+            )
+        endif() 
+    endif()
+endif()
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev