@@ -179,16 +179,16 @@ set(CCLANG_OPTIONS
179
179
"-DCOMMON_CLANG_LIBRARY_NAME:STRING=${COMMON_CLANG_LIBRARY_NAME} "
180
180
)
181
181
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" )
184
184
endif ()
185
185
186
186
if (NOT CLANG_SOURCE_DIR )
187
187
set (CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR} /../clang_source" )
188
188
endif ()
189
189
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" )
192
192
endif ()
193
193
194
194
set (CCLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR} /cclang" )
@@ -197,24 +197,25 @@ if(NOT CCLANG_INSTALL_DIR)
197
197
set (CCLANG_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR} /install" )
198
198
endif ()
199
199
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 } )
202
202
# 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")
204
204
205
205
# Use CLANG sources stored at CLANG_SOURCE_DIR.
206
206
set (CLANG_SOURCE_URL ${CLANG_SOURCE_DIR} )
207
207
208
208
# Use CCLANG sources stored at CCLANG_SOURCE_DIR
209
209
set (CCLANG_SOURCE_URL ${CCLANG_SOURCE_DIR} )
210
210
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} " )
218
219
219
220
220
221
# Customization patches will be applied to LLVM if present.
@@ -232,7 +233,7 @@ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
232
233
233
234
234
235
ExternalProject_Add (${CCLANG_LIB_NAME}
235
- URL ${LLVM_SOURCE_URL }
236
+ URL ${LLVM_STOCK_SOURCE_URL }
236
237
PREFIX src
237
238
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} /src
238
239
CMAKE_ARGS -G ${CMAKE_GENERATOR}
@@ -254,10 +255,10 @@ ExternalProject_Add_Step(${CCLANG_LIB_NAME} "add_cclang"
254
255
)
255
256
256
257
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
258
259
DEPENDEES add_cclang
259
260
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"
261
262
)
262
263
263
264
# Apply customization patches to LLVM if any.
0 commit comments