From b6cb2a87eed2f8b2e8fc1083c0ec2801ee300980 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Tue, 10 Feb 2015 12:15:44 +0100
Subject: [PATCH] fixed jsoncpp find_path

---
 CMakeLists.txt                 | 7 ++++---
 alethzero/NatspecHandler.h     | 2 +-
 cmake/FindJsoncpp.cmake        | 3 ++-
 libsolidity/ASTJsonConverter.h | 2 +-
 libsolidity/InterfaceHandler.h | 2 +-
 test/SolidityABIJSON.cpp       | 2 +-
 test/SolidityNatspecJSON.cpp   | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3adde425..a7de17000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,15 +135,15 @@ endif()
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
 add_subdirectory(liblll)
+
 if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
 	add_subdirectory(libserpent)
+	add_subdirectory(sc)
 endif ()
+
 add_subdirectory(libsolidity)
 add_subdirectory(lllc)
 add_subdirectory(solc)
-if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-add_subdirectory(sc)
-endif()
 
 if (JSONRPC)
 	add_subdirectory(libweb3jsonrpc)
@@ -161,6 +161,7 @@ add_subdirectory(libethereum)
 add_subdirectory(libwebthree)
 add_subdirectory(test)
 add_subdirectory(eth)
+
 if("x${CMAKE_BUILD_TYPE}" STREQUAL "xDebug")
 	add_subdirectory(exp)
 endif ()
diff --git a/alethzero/NatspecHandler.h b/alethzero/NatspecHandler.h
index edd9281d7..98677dbc2 100644
--- a/alethzero/NatspecHandler.h
+++ b/alethzero/NatspecHandler.h
@@ -26,7 +26,7 @@
 #pragma warning(disable: 4100 4267)
 #include <leveldb/db.h>
 #pragma warning(pop)
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <libdevcore/FixedHash.h>
 
 namespace ldb = leveldb;
diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake
index 36ba12a3e..c5b9c87d8 100644
--- a/cmake/FindJsoncpp.cmake
+++ b/cmake/FindJsoncpp.cmake
@@ -12,7 +12,8 @@
 # only look in default directories
 find_path(
 	JSONCPP_INCLUDE_DIR 
-	NAMES jsoncpp/json/json.h
+	NAMES json/json.h
+	PATH_SUFFIXES jsoncpp
 	DOC "jsoncpp include dir"
 )
 
diff --git a/libsolidity/ASTJsonConverter.h b/libsolidity/ASTJsonConverter.h
index cb43c2d9e..466801e9c 100644
--- a/libsolidity/ASTJsonConverter.h
+++ b/libsolidity/ASTJsonConverter.h
@@ -27,7 +27,7 @@
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/Exceptions.h>
 #include <libsolidity/Utils.h>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 namespace dev
 {
diff --git a/libsolidity/InterfaceHandler.h b/libsolidity/InterfaceHandler.h
index 2b62cabdf..08232e4d2 100644
--- a/libsolidity/InterfaceHandler.h
+++ b/libsolidity/InterfaceHandler.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <memory>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 
 namespace dev
 {
diff --git a/test/SolidityABIJSON.cpp b/test/SolidityABIJSON.cpp
index d600340eb..9cb7c9445 100644
--- a/test/SolidityABIJSON.cpp
+++ b/test/SolidityABIJSON.cpp
@@ -22,7 +22,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <libsolidity/CompilerStack.h>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <libdevcore/Exceptions.h>
 
 namespace dev
diff --git a/test/SolidityNatspecJSON.cpp b/test/SolidityNatspecJSON.cpp
index 911820ddd..91d504e8c 100644
--- a/test/SolidityNatspecJSON.cpp
+++ b/test/SolidityNatspecJSON.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/Exceptions.h>
 #include <libdevcore/Exceptions.h>