Merge branch 'develop' into 'primo' (89280c69) · Commits · AM / broccoli

.clang-format

+3 −7

Original line number	Diff line number	Diff line
		@@ -90,10 +90,6 @@ PenaltyBreakString: 1000
		PenaltyExcessCharacter: 1000000
		PenaltyReturnTypeOnItsOwnLine: 60
		PointerAlignment: Left
		RawStringFormats:
		- Delimiter: pb
		Language: TextProto
		BasedOnStyle: google
		ReflowComments: true
		SortIncludes: true
		SortUsingDeclarations: true

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,8 +60,8 @@ set(META_PROJECT_DESCRIPTION "Beautiful Robot C++ Code Library")
		set(META_AUTHOR_ORGANIZATION "Chair of Applied Mechanics, Technical University of Munich")
		set(META_AUTHOR_DOMAIN "https://am.mw.tum.de")
		set(META_AUTHOR_MAINTAINER "code@amm.mw.tum.de")
		set(META_VERSION_MAJOR "0")
		set(META_VERSION_MINOR "1")
		set(META_VERSION_MAJOR "1")
		set(META_VERSION_MINOR "0")
		set(META_VERSION_PATCH "0")
		set(META_VERSION_REVISION "${GIT_REV}")
		set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ include(ExternalProject)
		ExternalProject_Add(
		Eigen
		SOURCE_DIR "${CMAKE_BINARY_DIR}/eigen-src"
		URL "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.gz"
		URL http://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz
		UPDATE_COMMAND ""
		CONFIGURE_COMMAND ""
		BUILD_COMMAND ""

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ add_custom_target(${target} ALL
		WORKING_DIRECTORY ${path}
		COMMAND ${CMAKE_COMMAND} -E copy_directory ${path} ${doxyfile_directory} # ToDO, configure doxygen to use source as is
		COMMAND ${DOXYGEN} \"${doxyfile}\"
		COMMAND echo file://${DOXYGEN_OUTPUT_DIRECTORY}/html/index.html
		COMMENT "Creating doxygen documentation."
		)

+6 −1

Original line number	Diff line number	Diff line
		@@ -6,8 +6,10 @@

		#pragma once // Load this file only once

		// broccoli libraries
		#include "core/FixedStepArithmeticNumber.hpp"
		#include "core/IntegerTimeTypes.hpp"
		#include "core/Time.hpp"
		#include "core/floats.hpp"
		#include "core/math.hpp"

		/** \defgroup broccoli_core_module broccoli Core Module
		@@ -22,8 +24,11 @@
		*
		* File \| Description
		* ---- \| -----------
		* \code #include "core/floats.hpp" \endcode \| Defines \ref broccoli::core::floats - \copybrief broccoli::core::floats
		* \code #include "core/math.hpp" \endcode \| Defines \ref broccoli::core::math - \copybrief broccoli::core::math
		* \code #include "core/Time.hpp" \endcode \| Defines \ref broccoli::core::Time - \copybrief broccoli::core::Time
		* \code #include "core/FixedStepArithmeticNumber.hpp" \endcode \| Defines \ref broccoli::core::FixedStepArithmeticNumber - \copybrief broccoli::core::FixedStepArithmeticNumber
		* \code #include "core/IntegerTimeTypes.hpp" \endcode \| \copybrief IntegerTimeTypes.hpp
		*/

		// Documentation of namespace