From 60f778b9fcd1c59908293a6145dffd369d4f6daf Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Wed, 9 Jul 2014 21:37:23 -0700 Subject: [PATCH 1/2] relative include --- include/json/assertions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/json/assertions.h b/include/json/assertions.h index 425253a8d..d5d5ff4ef 100644 --- a/include/json/assertions.h +++ b/include/json/assertions.h @@ -9,7 +9,7 @@ #include #if !defined(JSON_IS_AMALGAMATION) -#include +#include "config.h" #endif // if !defined(JSON_IS_AMALGAMATION) #if JSON_USE_EXCEPTION From f3989977c0a339b06a46fe5aee7ad3cd1ae8cb62 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Wed, 9 Jul 2014 21:47:43 -0700 Subject: [PATCH 2/2] rm generated version.h --- .gitignore | 1 + include/json/version.h | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 include/json/version.h diff --git a/.gitignore b/.gitignore index e6fe0e968..ac925db49 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libs/ /doc/doxyfile /dist/ +/include/json/version.h diff --git a/include/json/version.h b/include/json/version.h deleted file mode 100644 index d3466c02c..000000000 --- a/include/json/version.h +++ /dev/null @@ -1,14 +0,0 @@ -// DO NOT EDIT. This file is generated by CMake from "version" -// and "version.h.in" files. -// Run CMake configure step to update it. -#ifndef JSON_VERSION_H_INCLUDED -# define JSON_VERSION_H_INCLUDED - -# define JSONCPP_VERSION_STRING "0.6.0-dev" -# define JSONCPP_VERSION_MAJOR 0 -# define JSONCPP_VERSION_MINOR 6 -# define JSONCPP_VERSION_PATCH 0 -# define JSONCPP_VERSION_QUALIFIER -dev -# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) - -#endif // JSON_VERSION_H_INCLUDED