Skip to content

Commit

Permalink
[External] Move lib/JSON to lib/External/JSON. NFC.
Browse files Browse the repository at this point in the history
For consistency with isl and ppcg which are already in lib/External.

llvm-svn: 294126
  • Loading branch information
Meinersbur committed Feb 5, 2017
1 parent 143902c commit 49c2122
Show file tree
Hide file tree
Showing 21 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion polly/.arclint
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"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"
Expand Down
7 changes: 3 additions & 4 deletions polly/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ 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
Expand Down Expand Up @@ -203,9 +203,8 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake

# 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)
Expand Down
2 changes: 1 addition & 1 deletion polly/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ licenses, and/or restrictions:

Program Directory
------- ---------
jsoncpp lib/JSON
jsoncpp lib/External/JSON



6 changes: 3 additions & 3 deletions polly/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 49c2122

Please sign in to comment.