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

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

llvm-svn: 294126
This commit is contained in:
Michael Kruse 2017-02-05 15:26:56 +00:00
parent 143902c29f
commit 49c21222a0
21 changed files with 8 additions and 9 deletions

View File

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

View File

@ -161,7 +161,7 @@ endif(CUDALIB_FOUND)
include_directories( include_directories(
BEFORE BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/include ${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_BINARY_DIR}/lib/External/isl/include
${CMAKE_CURRENT_SOURCE_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/pet/include
@ -203,9 +203,8 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake
# Add target to check formatting of polly files # 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 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 lib/External/*.cpp)
file( GLOB_RECURSE external lib/External/*.h lib/External/*.c) list( REMOVE_ITEM files ${external})
list( REMOVE_ITEM files ${jsonfiles} ${external})
set(check_format_depends) set(check_format_depends)
set(update_format_depends) set(update_format_depends)

View File

@ -55,7 +55,7 @@ licenses, and/or restrictions:
Program Directory Program Directory
------- --------- ------- ---------
jsoncpp lib/JSON jsoncpp lib/External/JSON

View File

@ -1,9 +1,9 @@
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
set(POLLY_JSON_FILES set(POLLY_JSON_FILES
JSON/json_reader.cpp External/JSON/json_reader.cpp
JSON/json_value.cpp External/JSON/json_value.cpp
JSON/json_writer.cpp External/JSON/json_writer.cpp
) )
set(ISL_CODEGEN_FILES set(ISL_CODEGEN_FILES