chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' of git.f3l.de:chizeta/cnorxz into dev

Browse source
This commit is contained in:
Christian Zimmermann 2023-05-10 01:20:40 +02:00
commit 1610084abd
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -60,7 +60,10 @@ endif()
find_package(cereal QUIET) find_package(cereal QUIET)
if(cereal_FOUND) if(cereal_FOUND)
message(STATUS "found cereal") message(STATUS "found cereal")
add_definitions(-DHAVE_CEREAL) if(ENABLE_cereal)
message(STATUS "enable cereal")
add_definitions(-DHAVE_CEREAL)
endif()
else() else()
message(STATUS "no cereal") message(STATUS "no cereal")
if(ENABLE_cereal) if(ENABLE_cereal)

4
src/include/base/macros.h
View file

@ -45,8 +45,8 @@
template <class Archive> void save(Archive& ar, const std::uint32_t version) const; \ template <class Archive> void save(Archive& ar, const std::uint32_t version) const; \
template <class Archive> void load(Archive& ar, const std::uint32_t version) template <class Archive> void load(Archive& ar, const std::uint32_t version)
#else #else
#define SERIALIZATION_FUNCTIONS #define SERIALIZATION_FUNCTIONS static const int v = 0
#define SERIALIZATION_FUNCTIONS_NOPUB #define SERIALIZATION_FUNCTIONS_NOPUB static const int v = 0
#endif #endif
#endif #endif