Enhancement: Adjust binary file location (#535)

.github/workflows/test.yml

@@ -121,12 +121,12 @@ jobs:
         shell: bash
         run: |
           cd build_release
-          ${{matrix.memtracer}} ./bin/memtracer_performance_test
+          ${{matrix.memtracer}} ./unittest/memtracer_performance_test
       - name: memtracer-unittest
         shell: bash
         run: |
           cd build_release
-          LD_PRELOAD=./lib/libmemtracer.so ./bin/memtracer_test
+          LD_PRELOAD=./lib/libmemtracer.so ./unittest/memtracer_test
       - name: memtracer-sysbench
         shell: bash
         run: |

CMakeLists.txt

@@ -7,6 +7,8 @@ MESSAGE(STATUS "This is Project source dir " ${PROJECT_SOURCE_DIR})
 MESSAGE(STATUS "This is PROJECT_BINARY_DIR dir " ${PROJECT_BINARY_DIR})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(UNITTEST_OUTPUT_PATH ${PROJECT_BINARY_DIR}/unittest)
+
 SET(CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/3rd/usr/local;/usr/local;${CMAKE_PREFIX_PATH}")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 

src/obclient/CMakeLists.txt

@@ -27,4 +27,4 @@ TARGET_LINK_LIBRARIES(obclient common pthread dl)
 # Target 必须在定义 ADD_EXECUTABLE 之后， programs 不受这个限制
 # TARGETS和PROGRAMS 的默认权限是OWNER_EXECUTE, GROUP_EXECUTE, 和WORLD_EXECUTE，即755权限， programs 都是处理脚步类
 # 类型分为RUNTIME／LIBRARY／ARCHIVE, prog
-INSTALL(TARGETS obclient RUNTIME DESTINATION bin)
+INSTALL(TARGETS obclient RUNTIME DESTINATION ${EXECUTABLE_OUTPUT_PATH})

src/observer/CMakeLists.txt

@@ -60,5 +60,5 @@ TARGET_LINK_LIBRARIES(observer_static ${LIBRARIES} oblsm)
 # TARGETS和PROGRAMS 的默认权限是OWNER_EXECUTE, GROUP_EXECUTE, 和WORLD_EXECUTE，即755权限， programs 都是处理脚本类
 # 类型分为RUNTIME／LIBRARY／ARCHIVE, prog
 INSTALL(TARGETS observer observer_static 
-    RUNTIME DESTINATION bin
+  RUNTIME DESTINATION ${EXECUTABLE_OUTPUT_PATH}
     ARCHIVE DESTINATION lib)

unittest/CMakeLists.txt

@@ -5,6 +5,8 @@ find_package(GTest CONFIG REQUIRED)
 
 include(GoogleTest)
 
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH})
+
 ADD_SUBDIRECTORY(common)
 IF (WITH_MEMTRACER)
     ADD_SUBDIRECTORY(memtracer)