build: remove MY_PROJ_INC_PATH (#386)

apache · Aug 27, 2019 · 6dfd6e9 · 6dfd6e9
1 parent af174a4
commit 6dfd6e9
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 36 deletions.
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -11,8 +11,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_SRC "")
 
-set(MY_PROJ_INC_PATH "")
-
 dsn_add_static_library()
 
 target_link_libraries(pegasus_base PUBLIC RocksDB::rocksdb)
+target_include_directories(pegasus_base PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 set(MY_PROJ_LIBS
         pegasus_geo_lib
         s2testing

diff --git a/src/geo/lib/CMakeLists.txt b/src/geo/lib/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 set(MY_PROJ_LIBS ""
         # s2
         # pegasus_client_static

diff --git a/src/geo/lib/geo_client.cpp b/src/geo/lib/geo_client.cpp
@@ -10,8 +10,9 @@
 #include <dsn/service_api_cpp.h>
 #include <dsn/dist/fmt_logging.h>
 #include <dsn/utility/errors.h>
-#include <base/pegasus_key_schema.h>
-#include <base/pegasus_utils.h>
+
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
 
 namespace pegasus {
 namespace geo {

diff --git a/src/redis_protocol/proxy/CMakeLists.txt b/src/redis_protocol/proxy/CMakeLists.txt
@@ -9,10 +9,7 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../../base" "../proxy_lib")
-
 set(MY_PROJ_LIBS pegasus.rproxylib
-                 pegasus_base
                  pegasus_geo_lib
                  pegasus_reporter
                  prometheus-cpp-pull

diff --git a/src/redis_protocol/proxy_lib/CMakeLists.txt b/src/redis_protocol/proxy_lib/CMakeLists.txt
@@ -9,12 +9,13 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../../base")
-
 set(MY_PROJ_LIBS "")
 
 add_definitions(-Wno-attributes)
 
 dsn_add_static_library()
 
-target_link_libraries(${MY_PROJ_NAME} PRIVATE RocksDB::rocksdb) # TODO(huangwei5): dsn_add_static_library doesnt link libs, need fix
+target_link_libraries(${MY_PROJ_NAME} PRIVATE RocksDB::rocksdb
+                                              pegasus_base) # TODO(huangwei5): dsn_add_static_library doesnt link libs, need fix
+
+target_include_directories(${MY_PROJ_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
diff --git a/src/redis_protocol/proxy_ut/CMakeLists.txt b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../../base" "../proxy_lib")
-
 set(MY_PROJ_LIBS gtest pthread)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

diff --git a/src/reporter/CMakeLists.txt b/src/reporter/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 dsn_add_static_library()
 
 target_link_libraries(${MY_PROJ_NAME} PUBLIC pegasus_base) # TODO(huangwei5): dsn_add_static_library doesnt link libs, need fix
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -9,8 +9,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 set(MY_PROJ_LIBS
     dsn_replica_server
     dsn_meta_server
@@ -23,6 +21,7 @@ set(MY_PROJ_LIBS
     dsn.replication.zookeeper_provider
     RocksDB::rocksdb
     pegasus_reporter
+    pegasus_base
     prometheus-cpp-pull
     prometheus-cpp-push
     prometheus-cpp-core
@@ -40,7 +39,8 @@ set(MY_PROJ_LIBS
     fmt
     rt
     aio
-    pthread)
+    pthread
+    )
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 

diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
@@ -10,9 +10,8 @@ set(MY_PROJ_SRC "linenoise/linenoise.c" "sds/sds.c")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB_RECURSE")
 
-set(MY_PROJ_INC_PATH "${PEGASUS_PROJECT_DIR}/src/base")
-
 set(MY_PROJ_LIBS
+    pegasus_base
     dsn.replication.tool
     dsn_replica_server
     dsn_replication_common
@@ -38,7 +37,11 @@ set(MY_PROJ_LIBS
 
 set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
 
-set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
+set(MY_BOOST_LIBS
+    Boost::system
+    Boost::filesystem 
+    Boost::regex # dsn_replica_server.so needs
+    )
 
 SET(CMAKE_INSTALL_RPATH ".")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

diff --git a/src/test/bench_test/CMakeLists.txt b/src/test/bench_test/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../../../rocksdb")
-
 set(MY_PROJ_LIBS
         pegasus_client_static
         RocksDB::rocksdb
@@ -22,4 +20,5 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 set(MY_BINPLACES "config.ini")
 
 dsn_add_executable()
+
 dsn_install_executable()
diff --git a/src/test/function_test/CMakeLists.txt b/src/test/function_test/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 set(MY_PROJ_LIBS
     dsn.replication.ddlclient
     dsn_replication_common

diff --git a/src/test/kill_test/CMakeLists.txt b/src/test/kill_test/CMakeLists.txt
@@ -3,16 +3,15 @@ project(${MY_PROJ_NAME} C CXX)
 
 # Source files under CURRENT project directory will be automatically included.
 # You can manually set MY_PROJ_SRC to include source files under other directories.
-set(MY_PROJ_SRC ../function_test/global_env.cpp)
+set(MY_PROJ_SRC "")
 
 # Search mode for source files under CURRENT project directory?
 # "GLOB_RECURSE" for recursive search
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../function_test")
-
 set(MY_PROJ_LIBS
+    pegasus_base
     pegasus_client_static
     dsn.replication.ddlclient
     dsn_replication_common

diff --git a/src/test/pressure_test/CMakeLists.txt b/src/test/pressure_test/CMakeLists.txt
@@ -10,8 +10,6 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "")
-
 set(MY_PROJ_LIBS
     pegasus_client_static
     )

diff --git a/src/test/upgrade_test/CMakeLists.txt b/src/test/upgrade_test/CMakeLists.txt
@@ -3,16 +3,15 @@ project(${MY_PROJ_NAME} C CXX)
 
 # Source files under CURRENT project directory will be automatically included.
 # You can manually set MY_PROJ_SRC to include source files under other directories.
-set(MY_PROJ_SRC ../function_test/global_env.cpp)
+set(MY_PROJ_SRC "")
 
 # Search mode for source files under CURRENT project directory?
 # "GLOB_RECURSE" for recursive search
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_INC_PATH "../function_test")
-
 set(MY_PROJ_LIBS
+    pegasus_base
     pegasus_client_static
     dsn.replication.ddlclient
     dsn_replication_common