Fixed some windows build issues

This commit is contained in:
Pedro Pinto committed 2017-08-08 09:40:54 -04:00
1 parent f5c358e4e9
commit b58df83ef9
10 files changed
+86 -85

No files matched your search

+23 -11
View File
@@ -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()
+10 -18
View File
@@ -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)
+1 -1
View File
@@ -9,7 +9,7 @@
#include "lib/config/invalid/invalid.pb.h"
#include "HTTPServer.h"
#include "catch/catch.h"
#include "catch/catch.hpp"
#include <iostream>
#include <memory>
+1 -1
View File
@@ -21,7 +21,7 @@
#define URDL_DISALE_SSL 1
#include <urdl/url.hpp>
#include <urdl/test/http_server.hpp>
#include <catch/catch.h>
#include <catch/catch.hpp>
using namespace bts::config;
using namespace bts::config::internal;
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.h"
#include "catch/catch.hpp"
#include "lib/utils/bts_chrono.h"
#include "lib/logging/logging.h"
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.h"
#include "catch/catch.hpp"
#include "lib/quickbus/quickbus.h"
#include "lib/quickbus/routing/Router.h"
+46 -49
View File
@@ -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()