[JSONExporter] Replace bundled Jsoncpp with llvm/Support/JSON.h. NFC.

Differential Revision: https://reviews.llvm.org/D49950

llvm-svn: 338461

2 files changed, 0 insertions, 59 deletions

diff --git a/polly/cmake/FindJsoncpp.cmake b/polly/cmake/FindJsoncpp.cmake
deleted file mode 100644
index cee44d10ce7..00000000000
--- a/polly/cmake/FindJsoncpp.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-find_package(PkgConfig QUIET)
-if (PkgConfig_FOUND)
-  pkg_search_module(JSONCPP jsoncpp QUIET)
-
-  # Get the libraries full paths, to be consistent with find_library().
-  set(fulllibs)
-  foreach (libname IN LISTS JSONCPP_LIBRARIES)
-    find_library(jsoncpp_lib${libname} NAMES ${libname}
-      HINTS ${JSONCPP_LIBDIR} ${JSONCPP_LIBRARY_DIRS}
-    )
-    if (jsoncpp_lib${libname})
-      list(APPEND fulllibs ${jsoncpp_lib${libname}})
-    else ()
-      list(APPEND fulllibs ${libname})
-    endif ()
-  endforeach ()
-  set(JSONCPP_LIBRARIES ${fulllibs})
-
-  set(JSONCPP_DEFINITIONS ${JSONCPP_CFLAGS})
-else ()
-  set(JSONCPP_DEFINITIONS)
-
-  find_path(JSONCPP_INCLUDE_DIR json/json.h
-    PATHS ENV JSONCPP_INCLUDE ENV JSONCPP_DIR
-    PATH_SUFFIXES jsoncpp
-    NO_DEFAULT_PATH
-  )
-  find_path(JSONCPP_INCLUDE_DIR json/json.h
-    PATH_SUFFIXES jsoncpp
-  )
-  mark_as_advanced(JSONCPP_INCLUDE_DIR)
-  set(JSONCPP_INCLUDE_DIRS "${JSONCPP_INCLUDE_DIR}")
-
-  find_library(JSONCPP_LIBRARY NAMES jsoncpp
-    HINTS ENV JSONCPP_LIB ENV JSONCPP_DIR
-    NO_DEFAULT_PATH
-  )
-  find_library(JSONCPP_LIBRARY NAMES jsoncpp)
-  mark_as_advanced(JSONCPP_LIBRARY)
-  set(JSON_LIBRARIES ${JSON_LIBRARY})
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Jsoncpp DEFAULT_MSG JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES JSONCPP_DEFINITIONS)
-
-if (Jsoncpp_FOUND)
-  add_library(jsoncpp INTERFACE IMPORTED)
-  foreach (incl IN LISTS JSONCPP_INCLUDE_DIRS)
-    set_property(TARGET jsoncpp APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${incl})
-  endforeach ()
-  foreach (libname IN LISTS JSONCPP_LIBRARIES)
-    set_property(TARGET jsoncpp APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${libname})
-  endforeach ()
-  foreach (opt IN LISTS JSONCPP_DEFINITIONS)
-    set_property(TARGET jsoncpp APPEND PROPERTY INTERFACE_COMPILE_OPTIONS ${opt})
-  endforeach ()
-endif ()
diff --git a/polly/cmake/PollyConfig.cmake.in b/polly/cmake/PollyConfig.cmake.in
index 1329071d2ee..8b8a27c4661 100644
--- a/polly/cmake/PollyConfig.cmake.in
+++ b/polly/cmake/PollyConfig.cmake.in
@@ -5,7 +5,6 @@ find_package(LLVM REQUIRED CONFIG
 
 set(Polly_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
 set(Polly_BUNDLED_ISL @POLLY_BUNDLED_ISL@)
-set(Polly_BUNDLED_JSONCPP @POLLY_BUNDLED_JSONCPP@)
 set(Polly_ENABLE_GPGPU_CODEGEN @POLLY_ENABLE_GPGPU_CODEGEN@)
 
 set(Polly_DEFINITIONS ${LLVM_DEFINITIONS})
@@ -28,7 +27,6 @@ if (NOT TARGET Polly)
   if (Polly_ENABLE_GPGPU_CODEGEN)
     set_property(TARGET Polly APPEND PROPERTY INTERFACE_LINK_LIBRARIES PollyPPCG)
   endif()
-  set_property(TARGET Polly APPEND PROPERTY INTERFACE_LINK_LIBRARIES @JSONCPP_LIBRARIES@)
 endif()
 
 if (NOT TARGET LLVMPolly)