Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 69cf8c7

Browse files
committed
[External] Move lib/JSON to lib/External/JSON. NFC.
For consistency with isl and ppcg which are already in lib/External. git-svn-id: https://llvm.org/svn/llvm-project/polly/trunk@294126 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent d90e99a commit 69cf8c7

21 files changed

+8
-9
lines changed

.arclint

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"linters": {
33
"format": {
44
"include": "(include/polly/.+\\.h$|lib/.+\\.cpp$)",
5-
"exclude": "(lib/JSON/.*)",
5+
"exclude": "(lib/External/JSON/.*)",
66
"type": "script-and-regex",
77
"script-and-regex.script": "sh -c './utils/check_format.sh \"$0\" 2> /dev/null || true'",
88
"script-and-regex.regex": "/^(OK:(?P<ignore>.+)|Error:) (?P<message>.+)$/m"

CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ endif(CUDALIB_FOUND)
161161
include_directories(
162162
BEFORE
163163
${CMAKE_CURRENT_SOURCE_DIR}/include
164-
${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
164+
${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
165165
${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
166166
${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
167167
${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
@@ -203,9 +203,8 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake
203203

204204
# Add target to check formatting of polly files
205205
file( GLOB_RECURSE files *.h lib/*.cpp lib/*.c tools/*.cpp tools/*.c tools/*.h unittests/*.cpp)
206-
file( GLOB_RECURSE jsonfiles lib/JSON/*.h lib/JSON/*.cpp)
207-
file( GLOB_RECURSE external lib/External/*.h lib/External/*.c)
208-
list( REMOVE_ITEM files ${jsonfiles} ${external})
206+
file( GLOB_RECURSE external lib/External/*.h lib/External/*.c lib/External/*.cpp)
207+
list( REMOVE_ITEM files ${external})
209208

210209
set(check_format_depends)
211210
set(update_format_depends)

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ licenses, and/or restrictions:
5555

5656
Program Directory
5757
------- ---------
58-
jsoncpp lib/JSON
58+
jsoncpp lib/External/JSON
5959

6060

6161

lib/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
set(LLVM_NO_RTTI 1)
22

33
set(POLLY_JSON_FILES
4-
JSON/json_reader.cpp
5-
JSON/json_value.cpp
6-
JSON/json_writer.cpp
4+
External/JSON/json_reader.cpp
5+
External/JSON/json_value.cpp
6+
External/JSON/json_writer.cpp
77
)
88

99
set(ISL_CODEGEN_FILES
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 commit comments

Comments
 (0)