use-deb-json

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

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

diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt
index b6309acd2fbbf55704b9cf94106a220be134c82d..99382c1ae15358f9863c3acb594d1d40909a6a68 100644 (file)
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -128,10 +128,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_BINARY_DIR}/include

diff --git a/polly/Makefile.config.in b/polly/Makefile.config.in
index 457567e19d7838769e88d4d91ab3271b4b3d378b..aefcf788cd1d77971f202588b940ee32d1ecbd3b 100644 (file)
--- a/polly/Makefile.config.in
+++ b/polly/Makefile.config.in
@@ -53,7 +53,7 @@ CUDALIB_FOUND := @cuda_found@
 POLLY_INC :=  @cuda_inc@ \
               -I$(POLLY_OBJ_ROOT)/lib/External/isl/include \
               -I$(POLLY_OBJ_ROOT)/lib/External/isl \
-              -I$(POLLY_SRC_ROOT)/lib/JSON/include \
+              -I/usr/include/jsoncpp \
               -I$(POLLY_SRC_ROOT)/lib/External/isl/include \
               -I$(POLLY_SRC_ROOT)/lib/External/isl/imath \
               -I$(POLLY_SRC_ROOT)/lib/External/isl

diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
index b83e75b290bad94f30993d8af76b4edd06c18b72..7bcee5a3828d7bfcf3eb9b3b30a5e16d0a174b65 100644 (file)
--- 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
@@ -46,7 +46,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
@@ -54,7 +54,7 @@ add_polly_library(Polly
   ${POLLY_HEADER_FILES}
   )
 
-target_link_libraries(Polly PollyISL)
+target_link_libraries(Polly PollyISL jsoncpp)
 
 if (BUILD_SHARED_LIBS)
   target_link_libraries(Polly

diff --git a/polly/lib/Makefile b/polly/lib/Makefile
index e267f0011387b0d3f69dde4ce9e3ad31dd1043bd..547e54f9d93693eaaadb532b9e16f579ffccbd81 100644 (file)
--- a/polly/lib/Makefile
+++ b/polly/lib/Makefile
@@ -26,9 +26,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
                    CodeGen/IslNodeBuilder.cpp \
                    CodeGen/CodeGeneration.cpp
 
-POLLY_JSON_FILES= JSON/json_reader.cpp \
-                  JSON/json_value.cpp \
-                  JSON/json_writer.cpp
+#POLLY_JSON_FILES= JSON/json_reader.cpp \
+#                  JSON/json_value.cpp \
+#                  JSON/json_writer.cpp
 
 ISL_FILES= External/isl/basis_reduction_tab.c \
            External/isl/isl_aff.c \
@@ -146,4 +146,5 @@ SOURCES= Polly.cpp \
 #
 include $(LEVEL)/Makefile.common
 
-LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
+