New upstream version 1.2.2 (7b83a9f5) · Commits · Debian Med / libcereal

.travis.yml

+26 −37

Original line number	Diff line number	Diff line
		language: cpp
		dist: trusty
		sudo: false
		group: beta

		addons:
		apt:
		sources:
		- 'ubuntu-toolchain-r-test'
		- 'boost-latest'
		packages:
		- 'g++-multilib'
		- 'libboost-serialization-dev'
		# - 'libboost-test-dev'

		compiler:
		# TODO: Clang is currently giving issues
		#- clang
		- gcc

		before_install:
		# Always install g++4.8.1
		- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
		matrix:
		include:
		- os: linux
		compiler: clang
		env: CMAKE_OPTIONS="-DSKIP_PORTABILITY_TEST=ON"

		# Install recent version of Boost
		- sudo add-apt-repository -y ppa:boost-latest/ppa
		# TODO: Add an entry for valgrind
		# after_script: make valgrind

		# clang 3.3
		- if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi

		- sudo apt-get update -qq

		install:
		- sudo apt-get install cmake
		- sudo apt-get install libboost1.54-all-dev

		# Always install valgrind
		- sudo apt-get install valgrind

		# Always install g++4.8.1
		- sudo apt-get install -qq g++-4.8
		- sudo apt-get install -qq g++-4.8-multilib
		- if [ "$CXX" = "g++" ]; then export CMAKE_CXX_COMPILER="g++-4.8"; fi
		- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi

		# clang 3.3
		- if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.3; fi
		- if [ "$CXX" == "clang++" ]; then export CMAKE_CXX_COMPILER="clang++-3.3"; fi
		- if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.3"; fi
		- os: osx
		osx_image: xcode8
		compiler: clang

		script:
		- mkdir build
		- cd build
		- cmake ..
		- make

		after_script:
		- ctest .
		# - make valgrind
		- mkdir build && cd build
		- cmake ${CMAKE_OPTIONS} .. && make -j4
		- ctest . --output-on-failure

		branches:
		only:

CMakeLists.txt

+15 −24

Original line number	Diff line number	Diff line
		cmake_minimum_required (VERSION 2.6.2)
		project (cereal)

		option(SKIP_PORTABILITY_TEST "Skip portability tests" OFF)
		option(SKIP_PORTABILITY_TEST "Skip portability (32 bit) tests" OFF)
		if(NOT CMAKE_VERSION VERSION_LESS 3.0) # installing cereal requires INTERFACE lib
		option(JUST_INSTALL_CEREAL "Don't do anything besides installing the library" OFF)
		endif()
		@@ -14,8 +14,14 @@ else()
		set(CEREAL_THREAD_LIBS "")
		endif()

		if(NOT MSVC)
		set(CMAKE_CXX_FLAGS "-Wall -Werror -g -Wextra -Wshadow -pedantic ${CMAKE_CXX_FLAGS}")
		if(MSVC)
		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /W3 /WX")
		else()
		set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")
		option(WITH_WERROR "Compile with '-Werror' C++ compiler flag" ON)
		if(WITH_WERROR)
		set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
		endif(WITH_WERROR)
		if(CMAKE_VERSION VERSION_LESS 3.1)
		set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
		else()
		@@ -45,31 +51,16 @@ endif()

		include_directories(./include)

		find_package(Boost COMPONENTS serialization unit_test_framework)
		# Boost serialization for performance sandbox
		find_package(Boost COMPONENTS serialization)

		if(Boost_FOUND)
		include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
		endif(Boost_FOUND)

		enable_testing()
		add_subdirectory(unittests)
		endif(Boost_FOUND)

		add_subdirectory(sandbox)

		find_package(Doxygen)
		if(DOXYGEN_FOUND)

		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen.in" "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg" @ONLY)
		add_custom_target(doc
		COMMAND ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg"
		WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
		COMMENT "Generating API documentation with Doxygen" VERBATIM
		)

		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/updatedoc.in" "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh" @ONLY)
		add_custom_target(update-doc
		COMMAND "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh"
		DEPENDS doc
		COMMENT "Copying documentation to gh-pages branch" VERBATIM
		)

		endif(DOXYGEN_FOUND)
		add_subdirectory(doc)

README.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ cereal is licensed under the [BSD license](http://opensource.org/licenses/BSD-3-
		## cereal build status

		* develop : [![Build Status](https://travis-ci.org/USCiLab/cereal.png?branch=develop)](https://travis-ci.org/USCiLab/cereal)
		[![Build status](https://ci.appveyor.com/api/projects/status/91aou6smj36or0vb/branch/develop?svg=true)](https://ci.appveyor.com/project/AzothAmmo/cereal/branch/develop)

		---

appveyor.yml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		# can use variables like {build} and {branch}
		version: 1.2.{build}
		pull_requests:
		do_not_increment_build_number: true

		branches:
		only:
		- develop

		configuration:
		- Debug
		- Release

		environment:
		matrix:
		- VS_VERSION_MAJOR: 12
		- VS_VERSION_MAJOR: 14
		BOOST_ROOT: C:\Libraries\boost_1_59_0

		platform:
		- Win32
		- x64

		before_build: "scripts\\appveyor.bat"

		build:
		parallel: true
		project: build/cereal.sln
		verbosity: minimal

		test_script: "scripts\\appveyor.bat test"

		artifacts:
		- path: build\Testing
		- path: out

doc/CMakeLists.txt

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		find_package(Doxygen)
		if(DOXYGEN_FOUND)

		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doxygen.in" "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg" @ONLY)
		add_custom_target(doc
		COMMAND ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg"
		WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
		COMMENT "Generating API documentation with Doxygen" VERBATIM
		)

		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../scripts/updatedoc.in" "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh" @ONLY)
		add_custom_target(update-doc
		COMMAND "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh"
		DEPENDS doc
		COMMENT "Copying documentation to gh-pages branch" VERBATIM
		)

		endif(DOXYGEN_FOUND)
		No newline at end of file