update

wangzhengquan

2020-12-30 da1172ca782618101a0034937602057cae1849e7

update

 CMakeLists.txt

@@ -7,6 +7,13 @@
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)

# control where the static and shared libraries are built so that on windows
# we don't need to tinker with the path to run the executable
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")

option(BUILD_SHARED_LIBS "Build using shared libraries" ON)


list(APPEND EXTRA_INCLUDES "${PROJECT_SOURCE_DIR}/include/usgcommon")

 src/CMakeLists.txt

@@ -29,25 +29,17 @@
    )

target_include_directories(shm_queue PUBLIC
                           "${PROJECT_BINARY_DIR}"
                           ${EXTRA_INCLUDES}
                           )

target_include_directories(shm_queue PUBLIC
                                                     ${PROJECT_BINARY_DIR}
                           ${CMAKE_CURRENT_SOURCE_DIR}
                           ${CMAKE_CURRENT_SOURCE_DIR}/shm
                           ${CMAKE_CURRENT_SOURCE_DIR}/queue
                           ${CMAKE_CURRENT_SOURCE_DIR}/socket
                           )

# state that anybody linking to us needs to include the current source dir
# to find MathFunctions.h, while we don't.
target_include_directories(shm_queue INTERFACE 
                                                     ${CMAKE_CURRENT_SOURCE_DIR}
                                           ${CMAKE_CURRENT_SOURCE_DIR}/shm
                                           ${CMAKE_CURRENT_SOURCE_DIR}/queue
                                           ${CMAKE_CURRENT_SOURCE_DIR}/socket
                                          )

# install rules
install(TARGETS shm_queue DESTINATION lib)

 test_net_socket/CMakeLists.txt

@@ -1,7 +1,12 @@

# add command
add_custom_command(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh
  COMMAND cp  ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh
  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh
  )

# add the executable
add_executable(test_net_mod_socket test_net_mod_socket.cpp)
add_executable(test_net_mod_socket test_net_mod_socket.cpp  ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh)
target_link_libraries(test_net_mod_socket PUBLIC shm_queue  ${EXTRA_LIBS} )

add_executable(heart_beat heart_beat.cpp)

 test_net_socket/is_seqnum.h

File was deleted

 test_net_socket/is_seqnum_cl.cpp

File was deleted

 test_net_socket/is_seqnum_sv.cpp

File was deleted