diff --git a/CMakeLists.txt b/CMakeLists.txt index 74a7af6fb..8f410ee9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,39 +123,4 @@ else() if(BUILD_SDK) add_subdirectory(src/sdk) endif() - - if(BUILD_SPARKD) - # add_custom_command( - # OUTPUT ${CMAKE_BINARY_DIR}/server - # COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server/src/lib_py-market-data - # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server - # # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib_py-market-data/libpy_market_data.so ${CMAKE_BINARY_DIR}/server - # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib_py-market-data/py_market_data.so ${CMAKE_BINARY_DIR}/server - # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib_py-market-data/py_market_data.so ${CMAKE_BINARY_DIR}/server/src/lib_py-market-data - # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server - # COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server - # COMMAND - # ln ARGS -sf - # ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0 - # ${CMAKE_BINARY_DIR}/server - # COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server - # COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins/py - # COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/src/lib_py-market-data/py-market-data/md_provider_impl.py ${CMAKE_BINARY_DIR}/server/plugins/py/ - # COMMENT "Creating server runtime layout" - # DEPENDS sparkd data_files_dir) - - # add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) - - # install( - # DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins" - # DESTINATION "${SPARK_INSTALL_PREFIX}/bin") - # install( - # DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins" - # DESTINATION "${SPARK_INSTALL_PREFIX}/bin") - # install( - # FILES - # "${SPARK_LIB}/libACE-5.7.5.so" - # "${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0" - # DESTINATION "${SPARK_INSTALL_PREFIX}/bin") - endif() endif() diff --git a/src/app_sparkd/CMakeLists.txt b/src/app_sparkd/CMakeLists.txt index f50c49659..b5d93f87f 100644 --- a/src/app_sparkd/CMakeLists.txt +++ b/src/app_sparkd/CMakeLists.txt @@ -83,13 +83,45 @@ endif() # add_dependencies(${PROJECT_NAME} py_market_data) list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/install/$/lib/cmake/py-market-data") -# find_package(py-market-data REQUIRED) -# message(WARNING "py-market-data Include Dirs: ${py-market-data_INCLUDE_DIRS}") -# target_include_directories(${PROJECT_NAME} PRIVATE ${py-market-data_INCLUDE_DIRS}) -# linking + +target_link_directories( + ${PROJECT_NAME} PUBLIC + $ + $ +) + +# Set RPATH so sparkd knows where to find our shared libs (e.g., libspark, lib_py_market_data). +# The dirs are relative to sparkd's path, represented by "$ORIGIN". +set_target_properties( + ${PROJECT_NAME} PROPERTIES + BUILD_RPATH "$ORIGIN/../lib_spark;$ORIGIN/../lib_py_market_data" + INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" +) + +include(${CMAKE_SOURCE_DIR}/cmake/SymLink.cmake) + +sym_link_local_lib(py_market_data) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so + ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so + DEPENDS + ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so + COMMENT "Creating symlink to py_market_data_module.so" +) +add_custom_target(create_symlinks ALL + DEPENDS ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so + DESTINATION ${CMAKE_INSTALL_BINDIR}/ +) + target_link_libraries( sparkd py_market_data + py_market_data_module spark ${emumba-deribit-connector-library_LIBRARIES} ssl @@ -109,30 +141,11 @@ target_link_libraries( -static-libstdc++ -pthread) -# file( -# GLOB_RECURSE ${PROJECT_NAME}_Headers -# RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} -# py-market-data/*.h -# ) - -# target_sources( -# ${PROJECT_NAME} -# PUBLIC -# FILE_SET HEADERS FILES ${${PROJECT_NAME}_HEADERS} -# ) - -# install(TARGETS ${PROJECT_NAME} -# EXPORT ${PROJECT_NAME}Targets -# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -# FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -# ) -# add_custom_command( -# TARGET sparkd -# POST_BUILD -# COMMAND ln -fs ${CMAKE_BINARY_DIR}/src/lib_spark/libspark.so ${CMAKE_CURRENT_BINARY_DIR} -# COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/../src/emumba/sparkd.lic ${CMAKE_BINARY_DIR}/src/app_sparkd/sparkd) - include(${CMAKE_SOURCE_DIR}/cmake/InstallBasicConfig.cmake) install_basic_config() +install( + FILES + "${EXTERNALS_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0" + "${EXTERNALS_LIB}/libACE-5.7.5.so" + DESTINATION ${CMAKE_INSTALL_LIBDIR} +)