From ed864cae5de45069d2abb88f0b8b2fc150ab3fed Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Feb 2022 14:48:54 -0500 Subject: [PATCH] style: Format cmake files --- CMakeLists.txt | 109 ++++++++++++-------- src/data_files/CMakeLists.txt | 4 +- src/lib/CMakeLists.txt | 102 ++++++++++--------- src/sdk/CMakeLists.txt | 7 +- src/server/sparkd/CMakeLists.txt | 71 +++++++------ src/web/CMakeLists.txt | 55 +++++++---- tools/Protobuf.cmake | 164 +++++++++++++++---------------- tools/safe_dep_glob.cmake | 44 ++++----- tools/vs_filters.cmake | 50 +++++----- 9 files changed, 327 insertions(+), 279 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d88aa4c1b..90ab0e9bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,71 +1,94 @@ cmake_minimum_required(VERSION 3.5) project(spark) -if (WIN32) - set (platform "windows") -else () - set (platform "linux") -endif () +if(WIN32) + set(platform "windows") +else() + set(platform "linux") +endif() -set (EXTERNALS_ROOT "${CMAKE_SOURCE_DIR}/externals/${platform}") -set (SPARK_PYTHON "${EXTERNALS_ROOT}/python") -set (SPARK_BIN "${EXTERNALS_ROOT}/bin") -set (SPARK_INCLUDE "${EXTERNALS_ROOT}/include") -set (SPARK_LIB "${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}") -set (BUILD_SDK OFF CACHE BOOL "Build the sdk") +set(EXTERNALS_ROOT "${CMAKE_SOURCE_DIR}/externals/${platform}") +set(SPARK_PYTHON "${EXTERNALS_ROOT}/python") +set(SPARK_BIN "${EXTERNALS_ROOT}/bin") +set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include") +set(SPARK_LIB "${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}") +set(BUILD_SDK OFF CACHE BOOL "Build the sdk") -include_directories (BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib) -link_directories (${SPARK_LIB}) +include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib) +link_directories(${SPARK_LIB}) -if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ - /MP \ - /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \ - /bigobj \ - /DCURL_STATICLIB \ - /D_WINSOCK_DEPRECATED_NO_WARNINGS \ - /D__TBB_NO_IMPLICIT_LINKAGE \ - /DBOOST_ALL_NO_LIB \ - /std:c++17 \ - /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600") - - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG") +if(WIN32) + # flags + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} \ + /MP \ + /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \ + /bigobj \ + /DCURL_STATICLIB \ + /D_WINSOCK_DEPRECATED_NO_WARNINGS \ + /D__TBB_NO_IMPLICIT_LINKAGE \ + /DBOOST_ALL_NO_LIB \ + /std:c++17 \ + /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT") + set( + CMAKE_SHARED_LINKER_FLAGS_RELEASE + "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} \ + /DEBUG \ + /OPT:REF \ + /OPT:ICF \ + /LTCG") + # subdirs add_subdirectory(src/lib) -else () -# so that sparkd looks for libspark.so in its directory - set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set (CMAKE_INSTALL_RPATH ".") +else() + # make sparkd look for libspark.so in its directory + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + set(CMAKE_INSTALL_RPATH ".") - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ - -fPIC -Wall -pedantic -Wextra -Werror \ - -Wno-missing-braces -Wno-ignored-qualifiers \ - --std=c++17 -fdiagnostics-color") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") + # flags + set( + CMAKE_CXX_FLAGS_DEBUG + "${CMAKE_CXX_FLAGS_DEBUG} \ + -fPIC \ + -Wall \ + -pedantic \ + -Wextra \ + -Werror \ + -Wno-missing-braces \ + -Wno-ignored-qualifiers \ + --std=c++17 -fdiagnostics-color") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") + + # subdirs add_subdirectory(src/server/sparkd) add_subdirectory(src/lib) add_subdirectory(src/web) add_subdirectory(doc/user) - if (BUILD_SDK) + if(BUILD_SDK) add_subdirectory(src/sdk) endif() add_subdirectory(src/data_files) - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/server COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server 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/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 COMMENT "Creating server runtime layout" - DEPENDS sparkd data_files_dir) + DEPENDS sparkd data_files_dir) add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) endif() diff --git a/src/data_files/CMakeLists.txt b/src/data_files/CMakeLists.txt index 977af83a7..548c4fa57 100644 --- a/src/data_files/CMakeLists.txt +++ b/src/data_files/CMakeLists.txt @@ -3,10 +3,10 @@ project(data_files) include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) -# DEPENDENCIES +# dependencies file (GLOB_RECURSE To_Copy RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} files/*) update_deps_file("${To_Copy}") -# END DEPENDENCIES + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/data_files COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/copy_data_files.sh diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 0af610d07..bcd19a732 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -5,34 +5,51 @@ include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) include(${CMAKE_SOURCE_DIR}/tools/Protobuf.cmake) # DEPENDENCIES -file(GLOB_RECURSE Config_Protos RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} config/protos/*.proto) -file (GLOB_RECURSE Service_Protos RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} api/services/*.proto) -file(GLOB_RECURSE NonConfig_Protos RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.proto) +file( + GLOB_RECURSE Config_Protos + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + config/protos/*.proto) +file( + GLOB_RECURSE Service_Protos + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + api/services/*.proto) +file( + GLOB_RECURSE NonConfig_Protos + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.proto) list(REMOVE_ITEM NonConfig_Protos ${Service_Protos} ${Config_Protos}) -file(GLOB_RECURSE Conf_Defaults RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} config/defaults/*.conf) +file( + GLOB_RECURSE Conf_Defaults + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + config/defaults/*.conf) -if (WIN32) - file(GLOB_RECURSE SparkLib_Sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} +if(WIN32) + file( + GLOB_RECURSE SparkLib_Sources + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} api/*.cpp config/*.cpp domain_model/*.cpp - expression/*.cpp - logging/*.cpp + expression/*.cpp + logging/*.cpp io/*.cpp - md/*.cpp + md/*.cpp os/*.cpp - quickbus/*.cpp - sparkproto/*.cpp - testing/*.cpp + quickbus/*.cpp + sparkproto/*.cpp + testing/*.cpp utils/*.cpp) -else () - file(GLOB_RECURSE SparkLib_Sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) +else() + file( + GLOB_RECURSE SparkLib_Sources + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cpp) endif() update_deps_file("${SparkLib_Sources};${Config_Protos};${Service_Protos};${NonConfig_Protos};${Conf_Defaults}") # END DEPENDENCIES -protobuf_generate_cpp( PROTO_SRCS PROTO_HDRS ${NonConfig_Protos} ${Config_Protos}) +protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${NonConfig_Protos} ${Config_Protos}) service_compiler_generate_cpp(SERVICE_COMPILER_SRCS SERVICE_COMPILER_HDRS ${Service_Protos}) # generate list of config protos @@ -59,7 +76,7 @@ endif() set(config_defaults_file ${CMAKE_CURRENT_BINARY_DIR}/config_defaults.h) # Defaults cannot be a single string because the compiler complains about a string longer than 65k set(config_defaults_str "const char * config_static_defaults[] = { ") -foreach (cfg_file_path ${Conf_Defaults}) +foreach(cfg_file_path ${Conf_Defaults}) file(READ ${cfg_file_path} cfg_file_content) string(REPLACE "\"" "\\\"" cfg_file_content_escaped ${cfg_file_content}) string(REPLACE "\n" ";" cfg_lines ${cfg_file_content_escaped}) @@ -76,33 +93,28 @@ if(NOT config_defaults_str STREQUAL old_defaults_str) file(WRITE "${config_defaults_file}" "${config_defaults_str}") endif() - -# lib -if (WIN32) - add_library(libspark SHARED - ${SparkLib_Sources} - ${PROTO_SRCS} - ${SERVICE_COMPILER_SRCS} - ) -else () - add_library(libspark SHARED - ${SparkLib_Sources} - ${PROTO_SRCS} - ${SERVICE_COMPILER_SRCS} - ) +# lib +if(WIN32) + add_library(libspark SHARED ${SparkLib_Sources} ${PROTO_SRCS} ${SERVICE_COMPILER_SRCS}) +else() + add_library(libspark SHARED ${SparkLib_Sources} ${PROTO_SRCS} ${SERVICE_COMPILER_SRCS}) endif() -#include paths -target_include_directories( libspark PUBLIC - ${CMAKE_SOURCE_DIR}/src/server/sparkd/cmds/spartan - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_BINARY_DIR}/src) +# include paths +target_include_directories( + libspark PUBLIC + ${CMAKE_SOURCE_DIR}/src/server/sparkd/cmds/spartan + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_BINARY_DIR}/src) -if (WIN32) - target_link_libraries( libspark +if(WIN32) + target_link_libraries( + libspark libcurl - debug fmtd - optimized fmt + debug + fmtd + optimized + fmt libtbb libboost_system libboost_thread @@ -115,10 +127,10 @@ if (WIN32) libprotoc libssl libcrypto - crypt32 - ) -else () - target_link_libraries( libspark + crypt32) +else() + target_link_libraries( + libspark protobuf double-conversion boost_system @@ -148,9 +160,9 @@ else () -lpcap -static-libgcc -static-libstdc++ - -pthread) + -pthread) endif() -if (WIN32) +if(WIN32) include(${CMAKE_SOURCE_DIR}/tools/vs_filters.cmake) endif() diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index ea6c03fee..314e806e7 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5) project(sdk) -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk - COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh - ARGS ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/sdk + COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh ARGS ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building SDK" DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh @@ -18,4 +18,3 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk server_layout) add_custom_target(sdk_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/sdk) - diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 02f28f2b0..da32c9a0a 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -4,24 +4,28 @@ project(sparkd) include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) include(${CMAKE_SOURCE_DIR}/tools/Protobuf.cmake) -# DEPENDENCIES ------------------------------------------------------------ -file(GLOB_RECURSE Protos RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.proto) -file(GLOB_RECURSE Sparkd_Sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.c) +# dependencies +file( + GLOB_RECURSE Protos + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.proto) +file( + GLOB_RECURSE Sparkd_Sources + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cpp *.c) update_deps_file("${Protos};${Sparkd_Sources}") -#END DEPENDENCIES ------------------------------------------------------------ -protobuf_generate_cpp( Proto_Srcs PROTO_HDRS ${Protos} ) +protobuf_generate_cpp(Proto_Srcs PROTO_HDRS ${Protos}) add_executable(sparkd ${Sparkd_Sources} ${Proto_Srcs}) -#include paths -target_include_directories( sparkd PUBLIC +# include paths +target_include_directories( + sparkd PUBLIC ${CMAKE_SOURCE_DIR}/src/server/sparkd/cmds/spartan ${CMAKE_SOURCE_DIR}/src - ${CMAKE_BINARY_DIR}/src/server/sparkd/cmds/spartan - ${emumba-deribit-connector-library_INCLUDE_DIRS} - ) + ${CMAKE_BINARY_DIR}/src/server/sparkd/cmds/spartan ${emumba-deribit-connector-library_INCLUDE_DIRS}) -find_package(PkgConfig REQUIRED) +find_package(PkgConfig REQUIRED) pkg_check_modules(emumba-deribit-connector-library REQUIRED emumba-deribit-connector) # This dir contains rapidjsonConfig.cmake @@ -32,36 +36,37 @@ add_dependencies(${PROJECT_NAME} rapidjson_project) # deribit-demo log level if(NOT DEFINED DERIBIT_DEMO_LOG_LEVEL) - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "TRACE") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "DEBUG") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=1) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=DEBUG") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=1) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=DEBUG") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "INFO") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=2) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=INFO") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=2) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=INFO") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "WARN") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=3) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=WARN") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=3) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=WARN") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "ERROR") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=4) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=ERROR") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=4) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=ERROR") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "CRITICAL") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=5) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=CRITICAL") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=5) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=CRITICAL") elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "OFF") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=6) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=OFF") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=6) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=OFF") else() - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") endif() # linking -target_link_libraries( sparkd +target_link_libraries( + sparkd libspark ${emumba-deribit-connector-library_LIBRARIES} ssl @@ -79,7 +84,9 @@ target_link_libraries( sparkd -lpcap -static-libgcc -static-libstdc++ - -pthread) + -pthread) -add_custom_command(TARGET sparkd POST_BUILD +add_custom_command( + TARGET sparkd + POST_BUILD COMMAND ln -fs ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index c50352a88..9a461a174 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -4,31 +4,44 @@ project(web) include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) include(${CMAKE_SOURCE_DIR}/tools/Protobuf.cmake) -# DEPENDENCIES +# dependencies set(PROTO_GLOBS - ../lib/api/*.proto - ../lib/api/services/*.proto - ../lib/domain_model/*.proto - ../lib/sparkproto/*.proto - ../lib/md/protos/*.proto - ../../externals/linux/include/google/protobuf/descriptor.proto - ../../externals/linux/include/google/protobuf/timestamp.proto - ) -file (GLOB_RECURSE Proto_Deps RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${PROTO_GLOBS}) -file (GLOB_RECURSE Proto_Deps_For_Tool RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/api ${PROTO_GLOBS}) -file (GLOB_RECURSE Api_Src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ui/src/*.fs) -file (GLOB_RECURSE Ui_Src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} api/src/*.ts) -file (GLOB_RECURSE build_scripts RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} api/*.sh) -set (All_Deps ${Proto_Deps} ${Api_Src} ${Ui_Src} ${build_scripts}) -update_deps_file("${All_Deps}") -# END DEPENDENCIES + ../lib/api/*.proto + ../lib/api/services/*.proto + ../lib/domain_model/*.proto + ../lib/sparkproto/*.proto + ../lib/md/protos/*.proto + ../../externals/linux/include/google/protobuf/descriptor.proto + ../../externals/linux/include/google/protobuf/timestamp.proto) -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/web/ui/bundle.js - COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/api/quiet_build.sh - ARGS ${CMAKE_BINARY_DIR} ${Proto_Deps_For_Tool} +file( + GLOB_RECURSE Proto_Deps + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROTO_GLOBS}) +file( + GLOB_RECURSE Proto_Deps_For_Tool + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/api + ${PROTO_GLOBS}) +file( + GLOB_RECURSE Api_Src + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ui/src/*.fs) +file( + GLOB_RECURSE Ui_Src + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + api/src/*.ts) +file( + GLOB_RECURSE build_scripts + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + api/*.sh) +set(All_Deps ${Proto_Deps} ${Api_Src} ${Ui_Src} ${build_scripts}) +update_deps_file("${All_Deps}") + +add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/web/ui/bundle.js + COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/api/quiet_build.sh ARGS ${CMAKE_BINARY_DIR} ${Proto_Deps_For_Tool} COMMENT "Building Web UI" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/api DEPENDS ${All_Deps}) add_custom_target(web_ui_bundle ALL DEPENDS ${CMAKE_BINARY_DIR}/web/ui/bundle.js) - diff --git a/tools/Protobuf.cmake b/tools/Protobuf.cmake index 8651f9c5a..5ef96dc0c 100644 --- a/tools/Protobuf.cmake +++ b/tools/Protobuf.cmake @@ -1,10 +1,8 @@ - -set (Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc") -set (PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}") -set (PROTOBUF_STATIC_LIB "libprotobuf") +set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc") +set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}") +set(PROTOBUF_STATIC_LIB "libprotobuf") function(Protobuf_Generate_Cpp SRCS HDRS) - set(${SRCS}) set(${HDRS}) @@ -13,7 +11,7 @@ function(Protobuf_Generate_Cpp SRCS HDRS) get_filename_component(FIL_WE ${FIL} NAME_WE) get_filename_component(FIL_DIR ${FIL} DIRECTORY) if(FIL_DIR) - set(FIL_WE "${FIL_DIR}/${FIL_WE}") + set(FIL_WE "${FIL_DIR}/${FIL_WE}") endif() list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") @@ -22,33 +20,38 @@ function(Protobuf_Generate_Cpp SRCS HDRS) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" - COMMAND ${Protobuf_PROTOC_EXECUTABLE} - ARGS - --cpp_out=${CMAKE_BINARY_DIR}/src - -I ${PROTOBUF_INCLUDE_DIRS} - -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} - DEPENDS ${ABS_FIL} + COMMAND + ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I + ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} + DEPENDS ${ABS_FIL} COMMENT "Running C++ protocol buffer compiler on ${FIL}" - VERBATIM ) + VERBATIM) endforeach() set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE) # remove some warnings from protobuf generated files - if (WIN32) - set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS "/wd4309 /wd4838") - else () + if(WIN32) set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS - "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized") + "/wd4309 /wd4838") + else() + set_source_files_properties( + ${${SRCS}} + PROPERTIES + COMPILE_FLAGS + "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" + ) endif() - set(${SRCS} ${${SRCS}} PARENT_SCOPE) - set(${HDRS} ${${HDRS}} PARENT_SCOPE) + set(${SRCS} + ${${SRCS}} + PARENT_SCOPE) + set(${HDRS} + ${${HDRS}} + PARENT_SCOPE) endfunction() - function(Service_Compiler_Generate_Cpp SRCS HDRS) - set(${SRCS}) set(${HDRS}) @@ -57,7 +60,7 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) get_filename_component(FIL_WE ${FIL} NAME_WE) get_filename_component(FIL_DIR ${FIL} DIRECTORY) if(FIL_DIR) - set(FIL_WE "${FIL_DIR}/${FIL_WE}") + set(FIL_WE "${FIL_DIR}/${FIL_WE}") endif() list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") @@ -69,77 +72,74 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc") list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h") - set (TEMPLATES - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h) + set(TEMPLATES + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h + ) - if (WIN32) - add_custom_command( - - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" - - COMMAND SET PYTHONPATH=${SPARK_PYTHON} - COMMAND ${Protobuf_PROTOC_EXECUTABLE} - - ARGS - --cpp_out=${CMAKE_BINARY_DIR}/src - --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd - --service_out=lang=cpp:${CMAKE_BINARY_DIR}/src - -I ${PROTOBUF_INCLUDE_DIRS} - -I ${CMAKE_SOURCE_DIR}/src - ${ABS_FIL} - - DEPENDS ${ABS_FIL} ${TEMPLATES} ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py - - COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM ) + if(WIN32) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" + COMMAND SET PYTHONPATH=${SPARK_PYTHON} + COMMAND + ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src + --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd + --service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I + ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} + DEPENDS ${ABS_FIL} ${TEMPLATES} + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py + COMMENT "Running C++ service compiler on ${FIL}" + VERBATIM) else() - add_custom_command( - - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" - - COMMAND "PYTHONPATH=${SPARK_PYTHON}" ${Protobuf_PROTOC_EXECUTABLE} - - ARGS - --cpp_out=${CMAKE_BINARY_DIR}/src - --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py - --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src - -I ${PROTOBUF_INCLUDE_DIRS} - -I ${CMAKE_SOURCE_DIR}/src - ${ABS_FIL} - - DEPENDS ${ABS_FIL} ${TEMPLATES} ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py - - COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM ) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" + COMMAND + "PYTHONPATH=${SPARK_PYTHON}" ${Protobuf_PROTOC_EXECUTABLE} ARGS + --cpp_out=${CMAKE_BINARY_DIR}/src + --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py + --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src + -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} + DEPENDS ${ABS_FIL} ${TEMPLATES} + ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py + COMMENT "Running C++ service compiler on ${FIL}" + VERBATIM) endif() - endforeach() set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE) # remove some warnings from protobuf generated files - if (WIN32) - set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS "/wd4309 /wd4838") - else () + if(WIN32) set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS - "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized") + "/wd4309 /wd4838") + else() + set_source_files_properties( + ${${SRCS}} + PROPERTIES + COMPILE_FLAGS + "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" + ) endif() - set(${SRCS} ${${SRCS}} PARENT_SCOPE) - set(${HDRS} ${${HDRS}} PARENT_SCOPE) + set(${SRCS} + ${${SRCS}} + PARENT_SCOPE) + set(${HDRS} + ${${HDRS}} + PARENT_SCOPE) endfunction() + diff --git a/tools/safe_dep_glob.cmake b/tools/safe_dep_glob.cmake index 3b8dc2255..6bfd5ef51 100644 --- a/tools/safe_dep_glob.cmake +++ b/tools/safe_dep_glob.cmake @@ -1,34 +1,32 @@ # inspired by https://stackoverflow.com/questions/1027247/specify-source-files-globally-with-glob -# Compare the new contents with the existing file, if it exists and is the -# same we don't want to trigger a make by changing its timestamp. +# Compare the new contents with the existing file, if it exists and is the same we don't want to +# trigger a make by changing its timestamp. function(update_file path content) - set(old_content "") - if(EXISTS "${path}") - file(READ "${path}" old_content) - endif() - if(NOT old_content STREQUAL content) - file(WRITE "${path}" "${content}") - endif() + set(old_content "") + if(EXISTS "${path}") + file(READ "${path}" old_content) + endif() + if(NOT old_content STREQUAL content) + file(WRITE "${path}" "${content}") + endif() endfunction(update_file) -# Creates a file called CMakeDeps.cmake next to your CMakeLists.txt with -# the list of dependencies in it - this file should be treated as part of -# CMakeLists.txt (source controlled, etc.). +# Creates a file called CMakeDeps.cmake next to your CMakeLists.txt with the list of dependencies in +# it - this file should be treated as part of CMakeLists.txt (source controlled, etc.). function(update_deps_file deps) - if (WIN32) + if(WIN32) set(deps_file "CMakeDeps_win.cmake") - else () + else() set(deps_file "CMakeDeps.cmake") endif() - # Normalize the list so it's the same on every machine - list(REMOVE_DUPLICATES deps) - list(SORT deps) - # Update the deps file - set(content "set(sources ${deps})") - update_file(${deps_file} "${content}") - # Include the file so it's tracked as a generation dependency we don't - # need the content. - include(${deps_file}) + # Normalize the list so it's the same on every machine + list(REMOVE_DUPLICATES deps) + list(SORT deps) + # Update the deps file + set(content "set(sources ${deps})") + update_file(${deps_file} "${content}") + # Include the file so it's tracked as a generation dependency we don't need the content. + include(${deps_file}) endfunction(update_deps_file) diff --git a/tools/vs_filters.cmake b/tools/vs_filters.cmake index 5d9f895a6..001fd4a2c 100644 --- a/tools/vs_filters.cmake +++ b/tools/vs_filters.cmake @@ -1,28 +1,24 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.5) -#add protos to the library to facilitate source_group -target_sources(libspark PUBLIC - ${Config_Protos} - ${NonConfig_Protos} - ${Service_Protos} -) - -# Explicitly set policy to convert relative paths to absolute (although this is -# a default policy, setting it explicitly prevents a compile-warning) -cmake_policy(SET CMP0076 NEW) - -function(assign_source_group) - foreach(_source IN ITEMS ${ARGN}) - if (IS_ABSOLUTE "${_source}") - file(RELATIVE_PATH _source_rel "${CMAKE_CURRENT_SOURCE_DIR}" "${_source}") - else() - set(_source_rel "${_source}") - endif() - get_filename_component(_source_path "${_source_rel}" PATH) - string(REPLACE "/" "\\" _source_path_msvc "${_source_path}") - source_group("${_source_path_msvc}" FILES "${_source}") - set(SOURCE_FILES "${_source}") - endforeach() -endfunction(assign_source_group) - -assign_source_group(${SparkLib_Sources} ${Config_Protos} ${NonConfig_Protos} ${Service_Protos}) +# add protos to the library to facilitate source_group +target_sources(libspark PUBLIC ${Config_Protos} ${NonConfig_Protos} ${Service_Protos}) + +# Explicitly set policy to convert relative paths to absolute (although this is a default policy, +# setting it explicitly prevents a compile-warning) +cmake_policy(SET CMP0076 NEW) + +function(assign_source_group) + foreach(_source IN ITEMS ${ARGN}) + if(IS_ABSOLUTE "${_source}") + file(RELATIVE_PATH _source_rel "${CMAKE_CURRENT_SOURCE_DIR}" "${_source}") + else() + set(_source_rel "${_source}") + endif() + get_filename_component(_source_path "${_source_rel}" PATH) + string(REPLACE "/" "\\" _source_path_msvc "${_source_path}") + source_group("${_source_path_msvc}" FILES "${_source}") + set(SOURCE_FILES "${_source}") + endforeach() +endfunction(assign_source_group) + +assign_source_group(${SparkLib_Sources} ${Config_Protos} ${NonConfig_Protos} ${Service_Protos})