Commit 5df2c1b5 authored by Aaron Bray's avatar Aaron Bray
Browse files

Update to latest protobuf and eigen libs

parent 97a11750
......@@ -14,14 +14,14 @@ endif()
##################################
message( STATUS "External project - Eigen" )
set(eigen_VERSION "3.3.4" )
set(eigen_VERSION "3.3.5" )
set(eigen_SRC "${CMAKE_BINARY_DIR}/eigen/src/eigen")
set(eigen_Patch "${CMAKE_SOURCE_DIR}/cmake/eigen-patches")
ExternalProject_Add( eigen
PREFIX eigen
URL "http://bitbucket.org/eigen/eigen/get/${eigen_VERSION}.tar.gz"
URL_HASH MD5=1a47e78efe365a97de0c022d127607c3
URL_HASH MD5=ee48cafede2f51fe33984ff5c9f48026
UPDATE_COMMAND
COMMAND ${CMAKE_COMMAND} -Deigen_source=${eigen_SRC} -Deigen_patch=${eigen_Patch} -P ${CMAKE_SOURCE_DIR}/cmake/eigen-patches/Patch.cmake
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
......@@ -67,8 +67,8 @@ list(APPEND Pulse_DEPENDENCIES log4cplus)
###################################################
message( STATUS "External project - protobuf" )
set(protobuf_VERSION "3.5.2" )
set(protobuf_MD5 "7b3e7c0eaa75dcc5cdb8aba2f8c301cb" )
set(protobuf_VERSION "3.6.0.1" )
set(protobuf_MD5 "0b33849480f5a469ba54b9ec10004e7b" )
set(protobuf_SRC "${CMAKE_BINARY_DIR}/protobuf/src/protobuf")
ExternalProject_Add( protobuf
......@@ -77,27 +77,15 @@ ExternalProject_Add( protobuf
URL_MD5 ${protobuf_MD5}
DOWNLOAD_DIR ${protobuf_SRC}
SOURCE_SUBDIR ./cmake
CMAKE_ARGS
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
-Dprotobuf_BUILD_TESTS:BOOL=OFF
-Dprotobuf_BUILD_EXAMPLES:BOOL=OFF
-Dprotobuf_BUILD_SHARED_LIBS:BOOL=OFF
-Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF#Don't change MSVC runtime settings (/MD or /MT)
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
${CMAKE_CXX_COMPILER_LAUNCHER_FLAG}
${CMAKE_C_COMPILER_LAUNCHER_FLAG}
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
-DMAKECOMMAND:STRING=${MAKECOMMAND}
-DADDITIONAL_C_FLAGS:STRING=${ADDITIONAL_C_FLAGS}
-DADDITIONAL_CXX_FLAGS:STRING=${ADDITIONAL_CXX_FLAGS}
-Dprotobuf_WITH_ZLIB:BOOL=OFF
)
list(APPEND Pulse_DEPENDENCIES protobuf)
......
......@@ -113,9 +113,7 @@ struct CommonDataModelException : public std::runtime_error
#include "Macros.h"
#include "utils/Logger.h"
PROTO_PUSH
#include "bind/cdm/Enums.pb.h"
PROTO_POP
class CCompoundUnit;
......
......@@ -32,20 +32,6 @@ inline size_t _Hash_value(_InIt _Begin, _InIt _End)
C4996 - 'function': was declared deprecated
*/
#if defined(_MSC_VER)
#define PROTO_PUSH \
__pragma(warning(push)) \
__pragma(warning(disable:4018 4146 4244 4251 4267 4305 4800 4996))
#else
#define PROTO_PUSH
#endif
#if defined(_MSC_VER)
#define PROTO_POP __pragma(warning(pop))
#else
#define PROTO_POP
#endif
#define DEFINE_STATIC_STRING(name) static constexpr char const* name = #name;
#define DEFINE_STATIC_STRING_EX(name,value) static constexpr char const* name = #value;
......
......@@ -2,9 +2,7 @@
See accompanying NOTICE file for details.*/
#include "circuit/SECircuitNode.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
template<CIRCUIT_NODE_TEMPLATE>
SECircuitNode<CIRCUIT_NODE_TYPES>::SECircuitNode(const std::string& name, Logger* logger) : Loggable(logger), m_Name(name)
......
......@@ -5,9 +5,7 @@
#include "circuit/electrical/SEElectricalCircuitNode.h"
#include "properties/SEScalarElectricCharge.h"
#include "properties/SEScalarElectricPotential.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEElectricalCircuitNode::SEElectricalCircuitNode(const std::string& name, Logger* logger) : SECircuitNode<SEScalarElectricPotential, SEScalarElectricCharge>(name, logger)
{
......
......@@ -9,9 +9,7 @@ See accompanying NOTICE file for details.*/
#include "properties/SEScalarElectricCurrent.h"
#include "properties/SEScalarElectricPotential.h"
#include "properties/SEScalarElectricCharge.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEElectricalCircuitPath::SEElectricalCircuitPath(SEElectricalCircuitNode& src, SEElectricalCircuitNode& tgt, const std::string& name) :
SECircuitPath<SEScalarElectricCurrent, SEScalarElectricResistance, SEScalarElectricCapacitance, SEScalarElectricInductance, SEScalarElectricPotential, SEScalarElectricCharge>(src,tgt,name),
......
......@@ -5,9 +5,7 @@
#include "circuit/fluid/SEFluidCircuitNode.h"
#include "properties/SEScalarPressure.h"
#include "properties/SEScalarVolume.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEFluidCircuitNode::SEFluidCircuitNode(const std::string& name, Logger* logger) : SECircuitNode<SEScalarPressure,SEScalarVolume>(name,logger)
{
......
......@@ -9,9 +9,7 @@
#include "properties/SEScalarVolumePerTime.h"
#include "properties/SEScalarPressure.h"
#include "properties/SEScalarVolume.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEFluidCircuitPath::SEFluidCircuitPath(SEFluidCircuitNode& src, SEFluidCircuitNode& tgt, const std::string& name) :
SECircuitPath<SEScalarVolumePerTime, SEScalarFlowResistance, SEScalarFlowCompliance, SEScalarFlowInertance, SEScalarPressure, SEScalarVolume>(src, tgt, name),
......
......@@ -5,9 +5,7 @@
#include "circuit/thermal/SEThermalCircuitNode.h"
#include "properties/SEScalarEnergy.h"
#include "properties/SEScalarTemperature.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEThermalCircuitNode::SEThermalCircuitNode(const std::string& name, Logger* logger) : SECircuitNode<THERMAL_CIRCUIT_NODE>(name,logger)
{
......
......@@ -9,9 +9,7 @@ See accompanying NOTICE file for details.*/
#include "properties/SEScalarPower.h"
#include "properties/SEScalarTemperature.h"
#include "properties/SEScalarEnergy.h"
PROTO_PUSH
#include "bind/cdm/Circuit.pb.h"
PROTO_POP
SEThermalCircuitPath::SEThermalCircuitPath(SEThermalCircuitNode& src, SEThermalCircuitNode& tgt, const std::string& name) :
SECircuitPath<SEScalarPower, SEScalarHeatResistance, SEScalarHeatCapacitance, SEScalarHeatInductance, SEScalarTemperature, SEScalarEnergy>(src, tgt ,name),
......
......@@ -4,9 +4,7 @@
#include "stdafx.h"
#include "compartment/SECompartment.h"
#include "circuit/SECircuitManager.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
SECompartment::SECompartment(const std::string& name, Logger* logger) : Loggable(logger), m_Name(name)
......
......@@ -4,9 +4,7 @@
#include "stdafx.h"
#include "compartment/SECompartmentLink.h"
#include "circuit/SECircuitManager.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
SECompartmentLink::SECompartmentLink(const std::string& name, Logger* logger) : Loggable(logger), m_Name(name)
......
......@@ -25,9 +25,7 @@
// Properties
#include "properties/SEScalarMassPerVolume.h"
#include "properties/SEScalarAmountPerVolume.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
#include <google/protobuf/text_format.h>
SECompartmentManager::SECompartmentManager(SESubstanceManager& subMgr) : Loggable(subMgr.GetLogger()), m_subMgr(subMgr)
......
......@@ -16,9 +16,7 @@ class SELiquidCompartmentGraph;
class SEThermalCompartment;
class SEThermalCompartmentLink;
class SETissueCompartment;
PROTO_PUSH
#include "bind/cdm/CompartmentEnums.pb.h"
PROTO_POP
CDM_BIND_DECL(CompartmentManagerData)
class CDM_DECL SECompartmentManager : public Loggable
......
......@@ -6,9 +6,7 @@
#include "circuit/fluid/SEFluidCircuitNode.h"
#include "compartment/SECompartmentNodes.h"
#include "substance/SESubstanceTransport.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
class SESubstance;
template<typename EdgeType, typename VertexType, typename CompartmentType> class SEFluidCompartmentLink;
......
......@@ -6,9 +6,7 @@
#include "substance/SESubstanceManager.h"
#include "properties/SEScalarVolume.h"
#include "properties/SEScalar0To1.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
SEGasCompartment::SEGasCompartment(const std::string& name, Logger* logger) : SEFluidCompartment(name, logger)
{
......
......@@ -7,9 +7,7 @@
#include "compartment/SECompartmentManager.h"
#include "properties/SEScalarVolume.h"
#include "properties/SEScalar0To1.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
void SEGasCompartmentGraph::Load(const cdm::GasCompartmentGraphData& src, SEGasCompartmentGraph& dst, SECompartmentManager& cmptMgr)
{
......
......@@ -4,9 +4,7 @@
#include "stdafx.h"
#include "compartment/fluid/SEGasCompartment.h"
#include "compartment/fluid/SEGasCompartmentLink.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
void SEGasCompartmentLink::Load(const cdm::GasCompartmentLinkData& src, SEGasCompartmentLink& dst, SECircuitManager* circuits)
{
......
......@@ -9,9 +9,7 @@
#include "properties/SEScalar.h"
#include "properties/SEScalar0To1.h"
#include "properties/SEScalarVolumePerTime.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
SELiquidCompartment::SELiquidCompartment(const std::string& name, Logger* logger) : SEFluidCompartment(name, logger)
{
......
......@@ -4,9 +4,7 @@
#include "stdafx.h"
#include "compartment/fluid/SELiquidCompartmentGraph.h"
#include "compartment/SECompartmentManager.h"
PROTO_PUSH
#include "bind/cdm/Compartment.pb.h"
PROTO_POP
void SELiquidCompartmentGraph::Load(const cdm::LiquidCompartmentGraphData& src, SELiquidCompartmentGraph& dst, SECompartmentManager& cmptMgr)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment