From b58df83ef928ca333ec63cdcc85747ce2fff94e6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 8 Aug 2017 09:40:54 -0400 Subject: [PATCH] Fixed some windows build issues --- CMakeLists.txt | 34 ++++--- externals | 2 +- src/lib/CMakeLists.txt | 28 ++---- src/lib/config/tests/config_ref_tests.cpp | 2 +- src/lib/config/tests/config_tests.cpp | 2 +- src/lib/logging/tests/logging_tests.cpp | 2 +- .../quickbus/pubsub/tests/qb_pubsub_tests.cpp | 2 +- src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp | 2 +- src/lib/quickbus/tests/quickbus_tests.cpp | 2 +- tools/Protobuf.cmake | 95 +++++++++---------- 10 files changed, 86 insertions(+), 85 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 678ecc7c8..2acbccde7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,24 +2,36 @@ cmake_minimum_required(VERSION 3.5) project(spark) if (WIN32) - include_directories ("c:/externals/include") + set (platform "windows") +else () + set (platform "linux") +endif () + +set (EXTERNALS_ROOT "${CMAKE_SOURCE_DIR}/externals/${platform}") +set (SPARK_BIN "${EXTERNALS_ROOT}/bin") +set (SPARK_INCLUDE "${EXTERNALS_ROOT}/include") +set (SPARK_LIB "${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}") +set (CMAKE_LIBRARY_PATH ${SPARK_LIB}) + +include_directories (BEFORE ${SPARK_INCLUDE}) +link_directories (BEFORE ${SPARK_LIB}) + +if (WIN32) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ /MP \ /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \ - /DCURL_STATICLIB + /DCURL_STATICLIB \ + /D_WINSOCK_DEPRECATED_NO_WARNINGS \ /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") add_subdirectory(src/lib) - add_subdirectory(src/client/tools) -else() - - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ - -Wall -pedantic -Wextra -Werror -Weffc++ -Wno-missing-braces --std=c++14") - - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3") - add_subdirectory(src/lib) - add_subdirectory(src/server/sparkd) +else () + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ + -Wall -pedantic -Wextra -Werror -Weffc++ -Wno-missing-braces --std=c++14") + set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3") + add_subdirectory(src/lib) + add_subdirectory(src/server/sparkd) endif() diff --git a/externals b/externals index fad9d2e5e..e596dbc5d 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit fad9d2e5ec364c875f6402e0cff73e2b8e86201b +Subproject commit e596dbc5d4938e24d15954bd8d288d21ded72c37 diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 9e1f2a7c2..00592283b 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -148,29 +148,21 @@ endif() target_include_directories( spark_lib PUBLIC ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/src - ${Protobuf_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} ) if (WIN32) - find_package(Boost REQUIRED COMPONENTS system thread filesystem regex chrono date_time atomic) - find_library (FMT NAMES fmt.lib) - find_library (SQLITE NAMES sqlite3.lib) - - if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) - target_include_directories (spark_lib PUBLIC "c:/externals/curl-debug/include") - target_link_libraries( spark_lib "c:/externals/curl-debug/lib/libcurl_a_debug.lib") - else() - target_include_directories (spark_lib PUBLIC "c:/externals/curl-release/include") - target_link_libraries( spark_lib "c:/externals/curl-release/lib/libcurl_a.lib") - endif() - target_link_libraries( spark_lib - ${Boost_LIBRARIES} - ${Protobuf_Static_Lib} - ${FMT} - ${SQLITE} + curl + fmt + boost_system + boost_thread + boost_filesystem + boost_regex + boost_chrono + boost_date_time + boost_atomic + protobuf ) else () set(Boost_USE_STATIC_LIBS ON) diff --git a/src/lib/config/tests/config_ref_tests.cpp b/src/lib/config/tests/config_ref_tests.cpp index 89cacd262..ef5465081 100755 --- a/src/lib/config/tests/config_ref_tests.cpp +++ b/src/lib/config/tests/config_ref_tests.cpp @@ -9,7 +9,7 @@ #include "lib/config/invalid/invalid.pb.h" #include "HTTPServer.h" -#include "catch/catch.h" +#include "catch/catch.hpp" #include #include diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib/config/tests/config_tests.cpp index f8febbb74..eac28687b 100755 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib/config/tests/config_tests.cpp @@ -21,7 +21,7 @@ #define URDL_DISALE_SSL 1 #include #include -#include +#include using namespace bts::config; using namespace bts::config::internal; diff --git a/src/lib/logging/tests/logging_tests.cpp b/src/lib/logging/tests/logging_tests.cpp index 48b32ea0f..39f7f69fc 100644 --- a/src/lib/logging/tests/logging_tests.cpp +++ b/src/lib/logging/tests/logging_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.h" +#include "catch/catch.hpp" #include "lib/utils/bts_chrono.h" #include "lib/logging/logging.h" diff --git a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp b/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp index 7a742bb3c..59ffdcb5a 100644 --- a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp +++ b/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.h" +#include "catch/catch.hpp" #include "lib/quickbus/quickbus.h" #include "lib/os/os.h" #include "lib/utils/bts_chrono.h" diff --git a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp b/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp index c9b510e2c..78d0019f4 100644 --- a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp +++ b/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.h" +#include "catch/catch.hpp" #include "lib/quickbus/quickbus.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" diff --git a/src/lib/quickbus/tests/quickbus_tests.cpp b/src/lib/quickbus/tests/quickbus_tests.cpp index eb07fa976..52572764d 100644 --- a/src/lib/quickbus/tests/quickbus_tests.cpp +++ b/src/lib/quickbus/tests/quickbus_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.h" +#include "catch/catch.hpp" #include "lib/quickbus/quickbus.h" #include "lib/quickbus/routing/Router.h" diff --git a/tools/Protobuf.cmake b/tools/Protobuf.cmake index 974f1a940..a55667722 100644 --- a/tools/Protobuf.cmake +++ b/tools/Protobuf.cmake @@ -1,11 +1,51 @@ -find_package(Protobuf REQUIRED) +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}) + + foreach(FIL ${ARGN}) + get_filename_component(ABS_FIL ${FIL} ABSOLUTE) + 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}") + endif() + + list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") + list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h") + + 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} + COMMENT "Running C++ protocol buffer compiler on ${FIL}" + 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 () + 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) +endfunction() -if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) - find_library (Protobuf_Static_Lib NAMES libprotobuf.a libprotobufd.lib ) -else() - find_library (Protobuf_Static_Lib NAMES libprotobuf.a libprotobuf.lib ) -endif() function(Service_Compiler_Generate_Cpp SRCS HDRS) @@ -74,46 +114,3 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) set(${HDRS} ${${HDRS}} PARENT_SCOPE) endfunction() - -function(Protobuf_Generate_Cpp SRCS HDRS) - - set(${SRCS}) - set(${HDRS}) - - foreach(FIL ${ARGN}) - get_filename_component(ABS_FIL ${FIL} ABSOLUTE) - 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}") - endif() - - list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") - list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h") - - 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} - COMMENT "Running C++ protocol buffer compiler on ${FIL}" - 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 () - 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) -endfunction()