From f3f4397ebbf608fdb3abd7bb838a4d9edfdd6d2a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 3 Sep 2024 12:39:02 -0400 Subject: [PATCH] build: Clean up client CMake --- CMakeLists.txt | 2 +- src/lib_spark/CMakeLists.txt | 4 - .../cmake/GetWindowsClientLinkLibraries.cmake | 2 + .../cmake/GetWindowsClientSources.cmake | 246 +++++++++--------- 4 files changed, 124 insertions(+), 130 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0db32cb0..03d69aa08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.12) -project(spark) +project(spark_root) set(CMAKE_CXX_STANDARD 20) if(WIN32) diff --git a/src/lib_spark/CMakeLists.txt b/src/lib_spark/CMakeLists.txt index 932908cac..ea5565c0f 100644 --- a/src/lib_spark/CMakeLists.txt +++ b/src/lib_spark/CMakeLists.txt @@ -99,10 +99,6 @@ if (DEFINED DOTNET_BINARY_DIR) "Copy ${PROJECT_NAME} bins to Dotnet build dir") endif() -if(WIN32) - include(${CMAKE_SOURCE_DIR}/cmake/vs_filters.cmake) -endif() - foreach(_hdr ${_proto_hdrs}) file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR}/protobufs ${_hdr}) install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) diff --git a/src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake b/src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake index ae1594222..d17e5a580 100644 --- a/src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake @@ -1,6 +1,8 @@ function(get_link_libraries dest) find_package(fmt CONFIG REQUIRED) set(${dest} + domain + system crypt32 fmt::fmt-header-only libcrypto diff --git a/src/lib_spark/cmake/GetWindowsClientSources.cmake b/src/lib_spark/cmake/GetWindowsClientSources.cmake index 811bd2b32..352448e35 100644 --- a/src/lib_spark/cmake/GetWindowsClientSources.cmake +++ b/src/lib_spark/cmake/GetWindowsClientSources.cmake @@ -2,16 +2,16 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) file( GLOB_RECURSE _cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - config/protos/*.proto + ${PROJECT_NAME}/config/protos/*.proto ) file( GLOB_RECURSE _service_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - api/services/*.proto) + ${PROJECT_NAME}/api/services/*.proto) file( GLOB_RECURSE _non_cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto) + ${PROJECT_NAME}/*.proto) list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs} ${_cfg_srcs}) file( @@ -37,127 +37,123 @@ endfunction() function(get_cpp_sources dest) set(${dest} - api/core/ApiClientInterop.cpp - api/core/ApiServerInterop.cpp - api/public/ApiServer.cpp - api/public/ClientChannel.cpp - api/public/QuickbusClientChannel.cpp - api/public/ServerChannel.cpp - api/public/ServiceContext.cpp - api/test/ApiTests.cpp - api/test/HelloServiceServer.cpp - config/ConfigDownloader.cpp - config/ConfigErrorCollector.cpp - config/ConfigPropertyEvaluator.cpp - config/ConfigQuerier.cpp - config/ConfigValueQueue.cpp - config/ConfigurationException.cpp - config/ConfigurationState.cpp - config/PreprocessInputStream.cpp - config/config.cpp - config/tests/HTTPServer.cpp - config/tests/config_ref_tests.cpp - config/tests/config_tests.cpp - config/text_format/text_format.cpp - core/TimeSpan.cpp - core/TimeStamp.cpp - domain/DomainSecurityUtils.cpp - domain/SecurityCriteria.cpp - domain/SecurityCriteriaClause.cpp - domain_model/Security.cpp - domain_model/SecurityTests.cpp - domain_model/sod.cpp - domain_model/tests/domain_tests.cpp - expression/BooleanGrammar.cpp - expression/ExpressionEvaluator.cpp - expression/ParserExceptions.cpp - expression/Value.cpp - expression/tests/expression_parser_tests.cpp - logging/LoggerHub.cpp - logging/Sink.cpp - logging/logging.cpp - logging/tests/logging_tests.cpp - md/Diag/MDPeriodicDumper.cpp - md/Diag/ShmDumper.cpp - md/MBOProcessor.cpp - md/MBOServiceServer.cpp - md/MDClient.cpp - md/MDConsumer.cpp - md/MDConsumerHandle.cpp - md/MDConsumerInterop.cpp - md/MDProducer.cpp - md/MDProducerHandle.cpp - md/MemorySegmentUtils.cpp - md/PriceSize.cpp - md/Product.cpp - md/SecurityCache.cpp - md/SecurityDB.cpp - md/SecurityMapper.cpp - md/SecurityMarketState.cpp - md/SecurityOracle.cpp - md/SecurityStore.cpp - md/ShmSegmentName.cpp - md/Shm/FixedSecurity.cpp - md/SyntheticSecurityService.cpp - md/cme/MDP3Utils.cpp - md/common.cpp - md/ice/ICEUtils.cpp - md/relay/QueryServer.cpp - md/relay/RelayClient.cpp - md/relay/RelayRecorder.cpp - md/service/MarketDataServiceServer.cpp - md/test/Co2ManagedTestHelper.cpp - md/test/Co2TestInstrument.cpp - md/test/mbo_tests.cpp - md/test/md2_tests.cpp - md/test/md_test_utils.cpp - md/test/synthetic_book_merge_tests.cpp - os/os.cpp - os/tests/os_tests.cpp - quickbus/core/LocalNode.cpp - quickbus/core/Quickbus.cpp - quickbus/core/SubscriptionID.cpp - quickbus/core/TableID.cpp - quickbus/message_model/Update.cpp - quickbus/message_model/merge_updates.cpp - quickbus/network/QBConnection.cpp - quickbus/network/QBConnectionManager.cpp - quickbus/network/endpoint_description.cpp - quickbus/pubsub/TablePublisher.cpp - quickbus/pubsub/TableSubscriber.cpp - quickbus/pubsub/tests/qb_pubsub_tests.cpp - quickbus/routing/INode.cpp - quickbus/routing/NodeID.cpp - quickbus/routing/Router.cpp - quickbus/rpc/RPCClient.cpp - quickbus/rpc/RPCServer.cpp - quickbus/rpc/RPCSessionID.cpp - quickbus/rpc/rpc_utils.cpp - quickbus/rpc/tests/qb_rpc_tests.cpp - quickbus/tests/quickbus_tests.cpp - testing/catch_test_runner.cpp - utils/AuthSessionManager.cpp - utils/AuthToken.cpp - utils/Dispatcher.cpp - utils/FileUtils.cpp - utils/GrowableSPSCQueue.cpp - utils/HTTPStream.cpp - utils/MathUtils.cpp - utils/PBUtils.cpp - utils/Puid.cpp - utils/SecureLogon.cpp - utils/SharedMemory.cpp - utils/Uuid.cpp - utils/datetime.cpp - utils/download.cpp - utils/file_utils.cpp - utils/init_spark_lib.cpp - utils/is_unittest_environment.cpp - utils/sftp.cpp - utils/stats.cpp - utils/tests/AuthTokenTests.cpp - utils/tests/MathUtilsTests.cpp - utils/tests/SingleWriterConcurrentVectorTests.cpp - utils/thread_manager.cpp + ${PROJECT_NAME}/api/core/ApiClientInterop.cpp + ${PROJECT_NAME}/api/core/ApiServerInterop.cpp + ${PROJECT_NAME}/api/public/ApiServer.cpp + ${PROJECT_NAME}/api/public/ClientChannel.cpp + ${PROJECT_NAME}/api/public/QuickbusClientChannel.cpp + ${PROJECT_NAME}/api/public/ServerChannel.cpp + ${PROJECT_NAME}/api/public/ServiceContext.cpp + ${PROJECT_NAME}/api/test/ApiTests.cpp + ${PROJECT_NAME}/api/test/HelloServiceServer.cpp + ${PROJECT_NAME}/config/ConfigDownloader.cpp + ${PROJECT_NAME}/config/ConfigErrorCollector.cpp + ${PROJECT_NAME}/config/ConfigPropertyEvaluator.cpp + ${PROJECT_NAME}/config/ConfigQuerier.cpp + ${PROJECT_NAME}/config/ConfigValueQueue.cpp + ${PROJECT_NAME}/config/ConfigurationException.cpp + ${PROJECT_NAME}/config/ConfigurationState.cpp + ${PROJECT_NAME}/config/PreprocessInputStream.cpp + ${PROJECT_NAME}/config/config.cpp + ${PROJECT_NAME}/config/tests/HTTPServer.cpp + ${PROJECT_NAME}/config/tests/config_ref_tests.cpp + ${PROJECT_NAME}/config/tests/config_tests.cpp + ${PROJECT_NAME}/config/text_format/text_format.cpp + ${PROJECT_NAME}/domain/DomainSecurityUtils.cpp + ${PROJECT_NAME}/domain_model/Security.cpp + ${PROJECT_NAME}/domain_model/SecurityTests.cpp + ${PROJECT_NAME}/domain_model/sod.cpp + ${PROJECT_NAME}/domain_model/tests/domain_tests.cpp + ${PROJECT_NAME}/expression/BooleanGrammar.cpp + ${PROJECT_NAME}/expression/ExpressionEvaluator.cpp + ${PROJECT_NAME}/expression/ParserExceptions.cpp + ${PROJECT_NAME}/expression/Value.cpp + ${PROJECT_NAME}/expression/tests/expression_parser_tests.cpp + ${PROJECT_NAME}/logging/LoggerHub.cpp + ${PROJECT_NAME}/logging/Sink.cpp + ${PROJECT_NAME}/logging/logging.cpp + ${PROJECT_NAME}/logging/tests/logging_tests.cpp + ${PROJECT_NAME}/md/Diag/MDPeriodicDumper.cpp + ${PROJECT_NAME}/md/Diag/ShmDumper.cpp + ${PROJECT_NAME}/md/MBOProcessor.cpp + ${PROJECT_NAME}/md/MBOServiceServer.cpp + ${PROJECT_NAME}/md/MDClient.cpp + ${PROJECT_NAME}/md/MDConsumer.cpp + ${PROJECT_NAME}/md/MDConsumerHandle.cpp + ${PROJECT_NAME}/md/MDConsumerInterop.cpp + ${PROJECT_NAME}/md/MDProducer.cpp + ${PROJECT_NAME}/md/MDProducerHandle.cpp + ${PROJECT_NAME}/md/MemorySegmentUtils.cpp + ${PROJECT_NAME}/md/PriceSize.cpp + ${PROJECT_NAME}/md/Product.cpp + ${PROJECT_NAME}/md/SecurityCache.cpp + ${PROJECT_NAME}/md/SecurityDB.cpp + ${PROJECT_NAME}/md/SecurityMapper.cpp + ${PROJECT_NAME}/md/SecurityMarketState.cpp + ${PROJECT_NAME}/md/SecurityOracle.cpp + ${PROJECT_NAME}/md/SecurityStore.cpp + ${PROJECT_NAME}/md/ShmSegmentName.cpp + ${PROJECT_NAME}/md/Shm/FixedSecurity.cpp + ${PROJECT_NAME}/md/SyntheticSecurityService.cpp + ${PROJECT_NAME}/md/cme/MDP3Utils.cpp + ${PROJECT_NAME}/md/common.cpp + ${PROJECT_NAME}/md/ice/ICEUtils.cpp + ${PROJECT_NAME}/md/relay/QueryServer.cpp + ${PROJECT_NAME}/md/relay/RelayClient.cpp + ${PROJECT_NAME}/md/relay/RelayRecorder.cpp + ${PROJECT_NAME}/md/service/MarketDataServiceServer.cpp + ${PROJECT_NAME}/md/test/Co2ManagedTestHelper.cpp + ${PROJECT_NAME}/md/test/Co2TestInstrument.cpp + ${PROJECT_NAME}/md/test/mbo_tests.cpp + ${PROJECT_NAME}/md/test/md2_tests.cpp + ${PROJECT_NAME}/md/test/md_test_utils.cpp + ${PROJECT_NAME}/md/test/synthetic_book_merge_tests.cpp + ${PROJECT_NAME}/os/os.cpp + ${PROJECT_NAME}/os/tests/os_tests.cpp + ${PROJECT_NAME}/quickbus/core/LocalNode.cpp + ${PROJECT_NAME}/quickbus/core/Quickbus.cpp + ${PROJECT_NAME}/quickbus/core/SubscriptionID.cpp + ${PROJECT_NAME}/quickbus/core/TableID.cpp + ${PROJECT_NAME}/quickbus/message_model/Update.cpp + ${PROJECT_NAME}/quickbus/message_model/merge_updates.cpp + ${PROJECT_NAME}/quickbus/network/QBConnection.cpp + ${PROJECT_NAME}/quickbus/network/QBConnectionManager.cpp + ${PROJECT_NAME}/quickbus/network/endpoint_description.cpp + ${PROJECT_NAME}/quickbus/pubsub/TablePublisher.cpp + ${PROJECT_NAME}/quickbus/pubsub/TableSubscriber.cpp + ${PROJECT_NAME}/quickbus/pubsub/tests/qb_pubsub_tests.cpp + ${PROJECT_NAME}/quickbus/routing/INode.cpp + ${PROJECT_NAME}/quickbus/routing/NodeID.cpp + ${PROJECT_NAME}/quickbus/routing/Router.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCClient.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCServer.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCSessionID.cpp + ${PROJECT_NAME}/quickbus/rpc/rpc_utils.cpp + ${PROJECT_NAME}/quickbus/rpc/tests/qb_rpc_tests.cpp + ${PROJECT_NAME}/quickbus/tests/quickbus_tests.cpp + ${PROJECT_NAME}/testing/catch_test_runner.cpp + ${PROJECT_NAME}/utils/AuthSessionManager.cpp + ${PROJECT_NAME}/utils/AuthToken.cpp + ${PROJECT_NAME}/utils/Dispatcher.cpp + ${PROJECT_NAME}/utils/FileUtils.cpp + ${PROJECT_NAME}/utils/GrowableSPSCQueue.cpp + ${PROJECT_NAME}/utils/HTTPStream.cpp + ${PROJECT_NAME}/utils/MathUtils.cpp + ${PROJECT_NAME}/utils/PBUtils.cpp + ${PROJECT_NAME}/utils/Puid.cpp + ${PROJECT_NAME}/utils/SecureLogon.cpp + ${PROJECT_NAME}/utils/SharedMemory.cpp + ${PROJECT_NAME}/utils/Uuid.cpp + ${PROJECT_NAME}/utils/datetime.cpp + ${PROJECT_NAME}/utils/download.cpp + ${PROJECT_NAME}/utils/file_utils.cpp + ${PROJECT_NAME}/utils/init_spark_lib.cpp + ${PROJECT_NAME}/utils/is_unittest_environment.cpp + ${PROJECT_NAME}/utils/sftp.cpp + ${PROJECT_NAME}/utils/stats.cpp + ${PROJECT_NAME}/utils/tests/AuthTokenTests.cpp + ${PROJECT_NAME}/utils/tests/MathUtilsTests.cpp + ${PROJECT_NAME}/utils/tests/SingleWriterConcurrentVectorTests.cpp + ${PROJECT_NAME}/utils/thread_manager.cpp PARENT_SCOPE) endfunction()