Skip to content

Commit 9b2473d

Browse files
committed
Correct CMake vars for LLVM_SOURCE and OCL_HEADERS_DIR, because of overriding values from CMakelists in LLVM
Change-Id: If3fe3ce23868974ba046f148fbc6abd0266b0d73
1 parent fa75886 commit 9b2473d

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

CMakeLists.txt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,16 @@ set(CCLANG_OPTIONS
179179
"-DCOMMON_CLANG_LIBRARY_NAME:STRING=${COMMON_CLANG_LIBRARY_NAME}"
180180
)
181181

182-
if(NOT LLVM_SOURCE_DIR)
183-
set(LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm_source")
182+
if(NOT LLVM_STOCK_SOURCE_DIR)
183+
set(LLVM_STOCK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm_source")
184184
endif()
185185

186186
if(NOT CLANG_SOURCE_DIR)
187187
set(CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../clang_source")
188188
endif()
189189

190-
if(NOT OCL_HEADERS_DIR)
191-
set(OCL_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../opencl_headers")
190+
if(NOT CCLANG_OCL_HEADERS_DIR)
191+
set(CCLANG_OCL_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../opencl_headers")
192192
endif()
193193

194194
set (CCLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cclang")
@@ -197,24 +197,25 @@ if(NOT CCLANG_INSTALL_DIR)
197197
set(CCLANG_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install")
198198
endif()
199199

200-
# Use LLVM sources stored at LLVM_SOURCE_DIR.
201-
set(LLVM_SOURCE_URL ${LLVM_SOURCE_DIR})
200+
# Use LLVM sources stored at LLVM_STOCK_SOURCE_DIR.
201+
set(LLVM_STOCK_SOURCE_URL ${LLVM_STOCK_SOURCE_DIR})
202202
# Also tar archive with stock/pure LLVM sources can be used. Just specify the path ...
203-
# set(LLVM_SOURCE_URL "${CMAKE_CURRENT_SOURCE_DIR}/llvm-4.0.0.src.tar.xz")
203+
# set(LLVM_STOCK_SOURCE_URL "${CMAKE_CURRENT_SOURCE_DIR}/llvm-4.0.0.src.tar.xz")
204204

205205
# Use CLANG sources stored at CLANG_SOURCE_DIR.
206206
set(CLANG_SOURCE_URL ${CLANG_SOURCE_DIR})
207207

208208
# Use CCLANG sources stored at CCLANG_SOURCE_DIR
209209
set(CCLANG_SOURCE_URL ${CCLANG_SOURCE_DIR})
210210

211-
message(STATUS "LLVM_SOURCE_URL = ${LLVM_SOURCE_URL}")
212-
message(STATUS "CLANG_SOURCE_URL = ${CLANG_SOURCE_URL}")
213-
message(STATUS "CCLANG_LIB_NAME = ${CCLANG_LIB_NAME}")
214-
message(STATUS "CCLANG_SOURCE_URL = ${CCLANG_SOURCE_URL}")
215-
message(STATUS "CCLANG_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
216-
message(STATUS "CCLANG_INSTALL_DIR = ${CCLANG_INSTALL_DIR}")
217-
message(STATUS "CCLANG_OPTIONS = ${CCLANG_OPTIONS}")
211+
message(STATUS "LLVM_SOURCE_URL = ${LLVM_STOCK_SOURCE_URL}")
212+
message(STATUS "CLANG_SOURCE_URL = ${CLANG_SOURCE_URL}")
213+
message(STATUS "CCLANG_LIB_NAME = ${CCLANG_LIB_NAME}")
214+
message(STATUS "CCLANG_SOURCE_URL = ${CCLANG_SOURCE_URL}")
215+
message(STATUS "CCLANG_OCL_HEADERS_DIR = ${CCLANG_OCL_HEADERS_DIR}")
216+
message(STATUS "CCLANG_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
217+
message(STATUS "CCLANG_INSTALL_DIR = ${CCLANG_INSTALL_DIR}")
218+
message(STATUS "CCLANG_OPTIONS = ${CCLANG_OPTIONS}")
218219

219220

220221
# Customization patches will be applied to LLVM if present.
@@ -232,7 +233,7 @@ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
232233

233234

234235
ExternalProject_Add(${CCLANG_LIB_NAME}
235-
URL ${LLVM_SOURCE_URL}
236+
URL ${LLVM_STOCK_SOURCE_URL}
236237
PREFIX src
237238
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
238239
CMAKE_ARGS -G ${CMAKE_GENERATOR}
@@ -254,10 +255,10 @@ ExternalProject_Add_Step(${CCLANG_LIB_NAME} "add_cclang"
254255
)
255256

256257
ExternalProject_Add_Step(${CCLANG_LIB_NAME} "add_opencl_headers"
257-
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OCL_HEADERS_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/src/${CCLANG_LIB_NAME}/projects/cclang
258+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CCLANG_OCL_HEADERS_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/src/${CCLANG_LIB_NAME}/projects/cclang
258259
DEPENDEES add_cclang
259260
DEPENDERS patch
260-
COMMENT "Copying ${OCL_HEADERS_DIR} to ${CMAKE_CURRENT_BINARY_DIR}/src/src/${CCLANG_LIB_NAME}/projects/cclang"
261+
COMMENT "Copying ${CCLANG_OCL_HEADERS_DIR} to ${CMAKE_CURRENT_BINARY_DIR}/src/src/${CCLANG_LIB_NAME}/projects/cclang"
261262
)
262263

263264
# Apply customization patches to LLVM if any.

0 commit comments

Comments
 (0)