[Polly][External] Move jsoncpp to lib/External/JSON. NFC.

[Meinersbur]

Summary

For consistency with isl and ppcg which are already in lib/External.

Further changes might compile jsoncpp into its own library and optionally use the system's version instead. Debian's llvm package currently patches this in. See Debian Wiki and Debian's Polly patch.

[grosser]

Hi Michael,

this LGTM!

Regarding the idea of making this an external library, I am a little hesitant to add more build system features. Traditionally, this always caused bugs. However, if you feel this is the right choice and keep your eyes a little open, feel free to change things here.

One thing that I have thought of already a couple of times was to replace the JSON printer with the LLVM internal YAML printer. This would allow us to drop this external dependency. Even though JSON is (theoretically) a subset of YAML, I am not sure if we would want to exploit this or if we possibly even want to move the JSON printer to YAML. Obviously, this does not impact this very review, but might something to consider.

[Meinersbur]

Forgot to add the differential revision line in the commit.

Committed in: r294126

.arclint

 {
   "linters": {
     "format": {
       "include": "(include/polly/.+\\.h$|lib/.+\\.cpp$)",
-      "exclude": "(lib/JSON/.*)",
+      "exclude": "(lib/External/JSON/.*)",
       "type": "script-and-regex",
       "script-and-regex.script": "sh -c './utils/check_format.sh \"$0\" 2> /dev/null || true'",
       "script-and-regex.regex": "/^(OK:(?P<ignore>.+)|Error:) (?P<message>.+)$/m"
     },
     "chmod": {
       "type": "chmod"
     },
     "filename": {

CMakeLists.txt

 # Support GPGPU code generation if the library is available.
 if (CUDALIB_FOUND)
   INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
 endif(CUDALIB_FOUND)
 
 include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
   ${CMAKE_CURRENT_BINARY_DIR}/include
   )
 
 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

 # TODO: docs.
 
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake
                 ${POLLY_BINARY_DIR}/include/polly/Config/config.h )
 
 # Add target to check formatting of polly files
 file( GLOB_RECURSE files *.h lib/*.cpp lib/*.c tools/*.cpp tools/*.c tools/*.h unittests/*.cpp)
-file( GLOB_RECURSE jsonfiles lib/JSON/*.h lib/JSON/*.cpp)
-file( GLOB_RECURSE external lib/External/*.h lib/External/*.c)
-list( REMOVE_ITEM files ${jsonfiles} ${external})
+file( GLOB_RECURSE external lib/External/*.h lib/External/*.c lib/External/*.cpp)
+list( REMOVE_ITEM files ${external})
 
 set(check_format_depends)
 set(update_format_depends)
 set(i 0)
 foreach (file IN LISTS files)
   add_custom_command(OUTPUT polly-check-format${i}
     COMMAND clang-format -sort-includes -style=llvm ${file} | diff -u ${file} -
     VERBATIM

LICENSE.txt

 licenses gives permission to use the names of the Polly Team or promote products
 derived from this Software.
 
 The following pieces of software have additional or alternate copyrights,
 licenses, and/or restrictions:
 
 Program             Directory
 -------             ---------
-jsoncpp             lib/JSON
+jsoncpp             lib/External/JSON
 
 
 

lib/CMakeLists.txt

 set(LLVM_NO_RTTI 1)
 
 set(POLLY_JSON_FILES
-    JSON/json_reader.cpp
-    JSON/json_value.cpp
-    JSON/json_writer.cpp
+    External/JSON/json_reader.cpp
+    External/JSON/json_value.cpp
+    External/JSON/json_writer.cpp
 )
 
 set(ISL_CODEGEN_FILES
     CodeGen/IslAst.cpp
     CodeGen/IslExprBuilder.cpp
     CodeGen/IslNodeBuilder.cpp
     CodeGen/CodeGeneration.cpp)