From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Fri, 13 Oct 2017 21:42:29 +0000 (+0100)
Subject: use-deb-json
X-Git-Tag: archive/raspbian/1%3.9.1-19+rpi1^2^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d670051a4939b45507b67be3fdef017cd573459f;p=llvm-toolchain-3.9.git

use-deb-json

===================================================================

Gbp-Pq: Name use-deb-json.diff
---

diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt
index b39af41e..7dc58fe2 100644
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -131,10 +131,13 @@ if (CUDALIB_FOUND)
   INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
 endif(CUDALIB_FOUND)
 
+find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp)
+
 include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+#  ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+  ${JSONCPP_INCLUDE_PATH}
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
index 26f0d8db..2e161c93 100644
--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(LLVM_NO_RTTI 1)
 
-set(POLLY_JSON_FILES
-    JSON/json_reader.cpp
-    JSON/json_value.cpp
-    JSON/json_writer.cpp
-)
+# set(POLLY_JSON_FILES
+#     JSON/json_reader.cpp
+#     JSON/json_value.cpp
+#     JSON/json_writer.cpp
+# )
 
 set(ISL_CODEGEN_FILES
     CodeGen/IslAst.cpp
@@ -49,7 +49,7 @@ add_polly_library(Polly
   Support/RegisterPasses.cpp
   Support/ScopHelper.cpp
   Support/ScopLocation.cpp
-  ${POLLY_JSON_FILES}
+#  ${POLLY_JSON_FILES}
   Transform/Canonicalization.cpp
   Transform/CodePreparation.cpp
   Transform/DeadCodeElimination.cpp
@@ -61,7 +61,7 @@ if (GPU_CODEGEN)
   target_link_libraries(Polly PollyPPCG)
 endif (GPU_CODEGEN)
 
-target_link_libraries(Polly PollyISL)
+target_link_libraries(Polly PollyISL jsoncpp)
 
 if (BUILD_SHARED_LIBS)
   target_link_libraries(Polly