add compile opt

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

Showing with 76 addition and 78 deletion

source/dnode/vnode/CMakeLists.txt source/dnode/vnode/CMakeLists.txt +40 -46

source/libs/stream/CMakeLists.txt source/libs/stream/CMakeLists.txt +36 -32

未找到文件。
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -80,55 +80,50 @@ IF (TD_VNODE_PLUGINS)
  )
 ENDIF ()
-IF (NOT ${TD_LINUX})
+# IF (NOT ${TD_LINUX})
-target_include_directories(
+# target_include_directories(
-    vnode
+#     vnode
-    PUBLIC "inc"
+#     PUBLIC "inc"
-    PUBLIC "src/inc"
+#     PUBLIC "src/inc"
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+#     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
-    PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+#     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
-)
+# )
-ELSE()
+# ELSE()
-target_include_directories(
+# target_include_directories(
-    vnode
+#     vnode
-    PUBLIC "inc"
+#     PUBLIC "inc"
-    PUBLIC "src/inc"
+#     PUBLIC "src/inc"
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+#     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
-)
+# )
+#ENDIF(NOT ${TD_LINUX})
-ENDIF(NOT ${TD_LINUX})
+if (${BUILD_CONTRIB})
-IF (TD_LINUX)
    target_include_directories(
-      vnode 
+        vnode
-      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+        PUBLIC "inc"
+        PUBLIC "src/inc"
+        PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+        PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
    )
+else()
-    target_link_directories(
+    target_include_directories(
-        vnode 
+        vnode
-        PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+        PUBLIC "inc"
+        PUBLIC "src/inc"
+        PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
    )
-target_link_libraries(
+    if (${TD_LINUX})
-    vnode
+        target_include_directories(
-    PUBLIC os
+            vnode 
-    PUBLIC util
+            PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-    PUBLIC common
+        )
-    PUBLIC tfs
+        target_link_directories(
-    PUBLIC wal
+            vnode 
-    PUBLIC qworker
+            PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-    PUBLIC sync
+        )
-    PUBLIC executor
+    endif()
-    PUBLIC scheduler
+endif()
-    PUBLIC tdb
-    # PUBLIC bdb
-    # PUBLIC scalar
-    PUBLIC rocksdb
-    PUBLIC transport
-    PUBLIC stream
-    PUBLIC index
-)
-ELSE()
 target_link_libraries(
    vnode
    PUBLIC os
@@ -149,7 +144,6 @@ target_link_libraries(
    PUBLIC stream
    PUBLIC index
 )
-ENDIF()
 IF (TD_GRANT)
  TARGET_LINK_LIBRARIES(vnode PUBLIC grant)

--- a/source/libs/stream/CMakeLists.txt
+++ b/source/libs/stream/CMakeLists.txt
@@ -8,39 +8,43 @@ target_include_directories(
 if(${BUILD_WITH_ROCKSDB})
-  IF (TD_LINUX)
+  if (${BUILD_CONTRIB})
+    target_link_libraries(
+      stream
+      PUBLIC rocksdb tdb
+      PRIVATE  os util transport qcom executor wal index
+    )
    target_include_directories(
-    stream
+      stream
-    PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+      PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
-  )
+    )
-  target_link_directories(
+  else()
-    stream 
+    if (TD_LINUX)
-    PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+      target_include_directories(
-  )
+      stream
-  target_link_libraries(
+      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-    stream
+    )
-    PUBLIC rocksdb tdb
+    target_link_directories(
-    PRIVATE  os util transport qcom executor wal index
+      stream 
-  )
+      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-  target_link_libraries(
+    )
-    stream
+    target_link_libraries(
-    PUBLIC rocksdb tdb
+      stream
-    PRIVATE  os util transport qcom executor wal index
+      PUBLIC rocksdb tdb
-  )
+      PRIVATE  os util transport qcom executor wal index
-  ELSE() 
+    )
-  target_link_libraries(
+    else() 
-    stream
+      target_link_libraries(
-    PUBLIC rocksdb tdb
+        stream
-    PRIVATE  os util transport qcom executor wal index
+        PUBLIC rocksdb tdb
-  )
+        PRIVATE  os util transport qcom executor wal index
-  target_include_directories(
+      )
-    stream
+      target_include_directories(
-    PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+        stream
-  )
+        PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+      )
-  ENDIF()
+    endif()
+  endif() 
  add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})