mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-14 03:51:40 +00:00
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
---
|
|
polly/CMakeLists.txt | 5 ++++-
|
|
polly/lib/CMakeLists.txt | 14 +++++++-------
|
|
2 files changed, 11 insertions(+), 8 deletions(-)
|
|
|
|
Index: llvm-toolchain-snapshot_5.0~svn294178/polly/CMakeLists.txt
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_5.0~svn294178.orig/polly/CMakeLists.txt
|
|
+++ llvm-toolchain-snapshot_5.0~svn294178/polly/CMakeLists.txt
|
|
@@ -158,10 +158,12 @@ if (CUDALIB_FOUND)
|
|
INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
|
|
endif(CUDALIB_FOUND)
|
|
|
|
+find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp)
|
|
+
|
|
include_directories(
|
|
BEFORE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/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
|
|
Index: llvm-toolchain-snapshot_5.0~svn294178/polly/lib/CMakeLists.txt
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_5.0~svn294178.orig/polly/lib/CMakeLists.txt
|
|
+++ llvm-toolchain-snapshot_5.0~svn294178/polly/lib/CMakeLists.txt
|
|
@@ -1,10 +1,10 @@
|
|
set(LLVM_NO_RTTI 1)
|
|
|
|
-set(POLLY_JSON_FILES
|
|
- External/JSON/json_reader.cpp
|
|
- External/JSON/json_value.cpp
|
|
- External/JSON/json_writer.cpp
|
|
-)
|
|
+#set(POLLY_JSON_FILES
|
|
+# External/JSON/json_reader.cpp
|
|
+# External/JSON/json_value.cpp
|
|
+# External/JSON/json_writer.cpp
|
|
+#)
|
|
|
|
set(ISL_CODEGEN_FILES
|
|
CodeGen/IslAst.cpp
|
|
@@ -51,7 +51,7 @@ add_polly_library(Polly
|
|
Support/ScopHelper.cpp
|
|
Support/ScopLocation.cpp
|
|
Support/ISLTools.cpp
|
|
- ${POLLY_JSON_FILES}
|
|
+# ${POLLY_JSON_FILES}
|
|
Transform/Canonicalization.cpp
|
|
Transform/CodePreparation.cpp
|
|
Transform/DeadCodeElimination.cpp
|
|
@@ -66,7 +66,7 @@ if (GPU_CODEGEN)
|
|
target_link_libraries(Polly PollyPPCG)
|
|
endif (GPU_CODEGEN)
|
|
|
|
-target_link_libraries(Polly PollyISL)
|
|
+target_link_libraries(Polly PollyISL jsoncpp)
|
|
|
|
if (BUILD_SHARED_LIBS)
|
|
target_link_libraries(Polly
|