CMake: remove MY_PROJ_LIB_PATH (#285)

XiaoMi · Aug 8, 2019 · 5836aea · 5836aea
1 parent 975c50d
commit 5836aea
Show file tree

Hide file tree

Showing 28 changed files with 4 additions and 73 deletions.
diff --git a/bin/dsn.cmake b/bin/dsn.cmake
@@ -50,7 +50,7 @@ function(dsn_install_executable)
     endif()
 endfunction()
 
-function(ms_add_project PROJ_TYPE PROJ_NAME PROJ_SRC PROJ_INC_PATH PROJ_LIBS PROJ_LIB_PATH PROJ_BINPLACES)
+function(ms_add_project PROJ_TYPE PROJ_NAME PROJ_SRC PROJ_INC_PATH PROJ_LIBS PROJ_BINPLACES)
     if(NOT((PROJ_TYPE STREQUAL "STATIC") OR (PROJ_TYPE STREQUAL "SHARED") OR
            (PROJ_TYPE STREQUAL "EXECUTABLE") OR (PROJ_TYPE STREQUAL "OBJECT")))
         message(FATAL_ERROR "Invalid project type.")
@@ -63,9 +63,6 @@ function(ms_add_project PROJ_TYPE PROJ_NAME PROJ_SRC PROJ_INC_PATH PROJ_LIBS PRO
     if(NOT (PROJ_INC_PATH STREQUAL ""))
         include_directories(${PROJ_INC_PATH})
     endif()
-    if(NOT (PROJ_LIB_PATH STREQUAL ""))
-        link_directories(${PROJ_LIB_PATH})
-    endif()
 
     if((PROJ_TYPE STREQUAL "STATIC") OR (PROJ_TYPE STREQUAL "OBJECT"))
         add_library(${PROJ_NAME} ${PROJ_TYPE} ${PROJ_SRC})
@@ -95,7 +92,6 @@ endfunction(ms_add_project)
 #     "GLOB" for non-recursive search
 # - MY_PROJ_SRC
 # - MY_PROJ_INC_PATH TODO(wutao1): remove this
-# - MY_PROJ_LIB_PATH TODO(wutao1): remove this
 # - MY_PROJ_LIBS
 # - MY_BINPLACES
 #     Extra files that will be installed
@@ -129,9 +125,6 @@ function(dsn_add_project)
     if(NOT DEFINED MY_PROJ_LIBS)
         set(MY_PROJ_LIBS "")
     endif()
-    if(NOT DEFINED MY_PROJ_LIB_PATH)
-        set(MY_PROJ_LIB_PATH "")
-    endif()
     if(NOT DEFINED MY_BINPLACES)
         set(MY_BINPLACES "")
     endif()
@@ -143,7 +136,7 @@ function(dsn_add_project)
     if((MY_PROJ_TYPE STREQUAL "SHARED") OR (MY_PROJ_TYPE STREQUAL "EXECUTABLE"))
         set(MY_PROJ_LIBS ${MY_PROJ_LIBS} ${TEMP_LIBS} ${MY_BOOST_LIBS} ${DSN_SYSTEM_LIBS})
     endif()
-    ms_add_project("${MY_PROJ_TYPE}" "${MY_PROJ_NAME}" "${MY_PROJ_SRC}" "${MY_PROJ_INC_PATH}" "${MY_PROJ_LIBS}" "${MY_PROJ_LIB_PATH}" "${MY_BINPLACES}")
+    ms_add_project("${MY_PROJ_TYPE}" "${MY_PROJ_NAME}" "${MY_PROJ_SRC}" "${MY_PROJ_INC_PATH}" "${MY_PROJ_LIBS}" "${MY_BINPLACES}")
 endfunction(dsn_add_project)
 
 function(dsn_add_static_library)
@@ -277,11 +270,11 @@ function(dsn_setup_system_libs)
     )
 endfunction(dsn_setup_system_libs)
 
-function(dsn_setup_include_path)#TODO: remove this
+function(dsn_setup_include_path)#TODO(huangwei5): remove this
     include_directories(${DSN_THIRDPARTY_ROOT}/include)
 endfunction(dsn_setup_include_path)
 
-function(dsn_setup_link_path)#TODO: dsn_setup_thirdparty_libs()
+function(dsn_setup_link_path)#TODO(huangwei5): dsn_setup_thirdparty_libs()
     set(Boost_USE_MULTITHREADED ON)
     set(Boost_USE_STATIC_LIBS OFF)
     set(Boost_USE_STATIC_RUNTIME OFF)

diff --git a/src/core/core/CMakeLists.txt b/src/core/core/CMakeLists.txt
@@ -9,8 +9,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/core/perf_counter/CMakeLists.txt b/src/core/perf_counter/CMakeLists.txt
@@ -11,8 +11,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt
@@ -16,8 +16,6 @@ set(MY_PROJ_LIBS gtest
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 
-set(MY_PROJ_LIB_PATH "${GTEST_LIB_DIR}")
-
 # Extra files that will be installed
 set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-bad-section.ini"
                  "${CMAKE_CURRENT_SOURCE_DIR}/config-dup-key.ini"

diff --git a/src/core/tools/common/CMakeLists.txt b/src/core/tools/common/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/core/tools/hpc/CMakeLists.txt b/src/core/tools/hpc/CMakeLists.txt
@@ -14,8 +14,6 @@ ${CONQUEUE_INCLUDE_DIRS})
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/core/tools/simulator/CMakeLists.txt b/src/core/tools/simulator/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/block_service/fds/CMakeLists.txt b/src/dist/block_service/fds/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH ${CMAKE_SOURCE_DIR}/thirdparty/output/include/fds )
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 #Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/block_service/local/CMakeLists.txt b/src/dist/block_service/local/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 #Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/cli/CMakeLists.txt b/src/dist/cli/CMakeLists.txt
@@ -11,8 +11,6 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_INC_PATH "")
 
-set(MY_PROJ_LIB_PATH "")
-
 dsn_add_static_library()
 
 add_subdirectory(shell)
diff --git a/src/dist/cli/shell/CMakeLists.txt b/src/dist/cli/shell/CMakeLists.txt
@@ -21,8 +21,6 @@ list(APPEND MY_PROJ_LIBS dsn_runtime)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
 

diff --git a/src/dist/failure_detector/CMakeLists.txt b/src/dist/failure_detector/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/failure_detector_multimaster/CMakeLists.txt b/src/dist/failure_detector_multimaster/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/nfs/CMakeLists.txt b/src/dist/nfs/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/nfs/test/CMakeLists.txt b/src/dist/nfs/test/CMakeLists.txt
@@ -15,8 +15,6 @@ set(MY_PROJ_LIBS dsn_nfs dsn_runtime gtest)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES
     "${CMAKE_CURRENT_SOURCE_DIR}/nfs_test_file1"

diff --git a/src/dist/replication/client/CMakeLists.txt b/src/dist/replication/client/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/common/CMakeLists.txt b/src/dist/replication/common/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/ddl_lib/CMakeLists.txt b/src/dist/replication/ddl_lib/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 set(MY_BINPLACES "")
 
 dsn_add_static_library()
diff --git a/src/dist/replication/global_checker/CMakeLists.txt b/src/dist/replication/global_checker/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH)
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/lib/CMakeLists.txt b/src/dist/replication/lib/CMakeLists.txt
@@ -24,8 +24,6 @@ set(MY_PROJ_LIBS
     dsn_http
     )
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/meta_server/CMakeLists.txt b/src/dist/replication/meta_server/CMakeLists.txt
@@ -33,11 +33,6 @@ set(MY_PROJ_LIBS
     crypto
     )
 
-set(MY_PROJ_LIB_PATH
-    ${LIBFDS_LIB_DIR}
-    ${POCO_LIB_DIR}
-)
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/storage_engine/simple_kv/CMakeLists.txt b/src/dist/replication/storage_engine/simple_kv/CMakeLists.txt
@@ -15,8 +15,6 @@ set(MY_PROJ_LIBS dsn_replica_server dsn_meta_server dsn_replication_client dsn_r
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
-set(MY_PROJ_LIB_PATH "")
-
 set(INI_FILES "")
 file(GLOB
     RES_FILES

diff --git a/src/dist/replication/test/meta_test/balancer_simulator/CMakeLists.txt b/src/dist/replication/test/meta_test/balancer_simulator/CMakeLists.txt
@@ -22,8 +22,6 @@ set(MY_PROJ_LIBS
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt b/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt
@@ -36,8 +36,6 @@ set(MY_PROJ_LIBS
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES clear.sh run.sh config-ddl-test.ini config-test.ini suite1 suite2)
 

diff --git a/src/dist/replication/test/simple_kv/CMakeLists.txt b/src/dist/replication/test/simple_kv/CMakeLists.txt
@@ -30,13 +30,6 @@ set(MY_PROJ_LIBS dsn_replica_server
                  )
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
-
-set(MY_PROJ_LIB_PATH 
-        ${GTEST_LIB_DIR}
-        ${ZOOKEEPER_LIB_DIR}
-        ${LIBFDS_LIB_DIR}
-        ${POCO_LIB_DIR}
-        )
 
 # Extra files that will be installed
 FILE(GLOB CASE_FILES "case-*")

diff --git a/src/dist/replication/tool_lib/CMakeLists.txt b/src/dist/replication/tool_lib/CMakeLists.txt
@@ -13,8 +13,6 @@ set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 set(MY_BINPLACES "")
 
 dsn_add_static_library()
diff --git a/src/dist/replication/zookeeper/CMakeLists.txt b/src/dist/replication/zookeeper/CMakeLists.txt
@@ -12,8 +12,6 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS "")
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES "")
 

diff --git a/src/tests/dsn/CMakeLists.txt b/src/tests/dsn/CMakeLists.txt
@@ -38,8 +38,6 @@ set(MY_PROJ_LIBS
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
-set(MY_PROJ_LIB_PATH "")
-
 # Extra files that will be installed
 set(MY_BINPLACES
     "${CMAKE_CURRENT_SOURCE_DIR}/run.sh"