zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cereal: Update to 1.2.2 (#3499)

Browse Source
This commit is contained in:
Erik Schnetter
2017-03-20 16:05:02 -04:00
committed by Adam J. Stewart
parent 91dd854694
commit ae8380c4fb
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/cereal/Boost.patch Normal file
View File

@@ -0,0 +1,14 @@
--- old/sandbox/CMakeLists.txt
+++ new/sandbox/CMakeLists.txt
@@ -4,9 +4,11 @@
add_executable(sandbox_json sandbox_json.cpp)
add_executable(sandbox_rtti sandbox_rtti.cpp)
+if(Boost_FOUND)
add_executable(sandbox_vs sandbox_vs.cpp)
target_link_libraries(sandbox_vs sandbox_vs_dll)
include_directories(sandbox_shared_lib)
+endif(Boost_FOUND)
if(Boost_FOUND)
add_executable(performance performance.cpp)

10
var/spack/repos/builtin/packages/cereal/Boost2.patch Normal file
View File

@@ -0,0 +1,10 @@
--- old/unittests/CMakeLists.txt
+++ new/unittests/CMakeLists.txt
@@ -1,4 +1,7 @@
file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+if(NOT Boost_FOUND)
+ list(REMOVE_ITEM TESTS boost_variant.cpp)
+endif(Boost_FOUND)
# A semi-colon separated list of test sources that should not be automatically built with doctest
set(SPECIAL_TESTS "portability_test.cpp")

10
var/spack/repos/builtin/packages/cereal/package.py
View File

@@ -39,6 +39,7 @@ class Cereal(Package):
homepage = "http://uscilab.github.io/cereal/"
url = "https://github.com/USCiLab/cereal/archive/v1.1.2.tar.gz"
version('1.2.2', '4c56c7b9499dba79404250ef9a040481')
version('1.2.1', '64476ed74c19068ee543b53ad3992261')
version('1.2.0', 'e372c9814696481dbdb7d500e1410d2b')
version('1.1.2', '34d4ad174acbff005c36d4d10e48cbb9')
@@ -47,7 +48,9 @@ class Cereal(Package):
version('1.0.0', 'd1bacca70a95cec0ddbff68b0871296b')
version('0.9.1', '8872d4444ff274ce6cd1ed364d0fc0ad')
patch("Werror.patch")
patch("Boost.patch")
patch("Boost2.patch", when="@1.2.2:")
patch("pointers.patch")
depends_on('cmake@2.6.2:', type='build')
@@ -57,7 +60,10 @@ def install(self, spec, prefix):
# configure
# Boost is only used for self-tests, which we are not running (yet?)
cmake('.', '-DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE', *std_cmake_args)
cmake('.',
'-DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE',
'-DSKIP_PORTABILITY_TEST=TRUE',
*std_cmake_args)
# Build
make()

14
var/spack/repos/builtin/packages/cereal/Werror.patch → var/spack/repos/builtin/packages/cereal/pointers.patch
View File

@@ -1,17 +1,3 @@
--- old/sandbox/CMakeLists.txt
+++ new/sandbox/CMakeLists.txt
@@ -4,9 +4,11 @@
add_executable(sandbox_json sandbox_json.cpp)
add_executable(sandbox_rtti sandbox_rtti.cpp)
+if(Boost_FOUND)
add_executable(sandbox_vs sandbox_vs.cpp)
target_link_libraries(sandbox_vs sandbox_vs_dll)
include_directories(sandbox_shared_lib)
+endif(Boost_FOUND)
if(Boost_FOUND)
add_executable(performance performance.cpp)
--- old/include/cereal/types/common.hpp
+++ new/include/cereal/types/common.hpp
@@ -106,14 +106,16 @@