[SYCL] Fix OpenCL installation directory following LLVM_LIBDIR_SUFFIX (…

…#1104) Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch>
intel · Feb 7, 2020 · 4d3d596 · 4d3d596
1 parent e026a0d
commit 4d3d596
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/opencl-aot/CMakeLists.txt b/opencl-aot/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 include(ExternalProject)
 
 if (NOT OpenCL_INCLUDE_DIRS)
-    message("OpenCL_INCLUDE_DIRS is missed. Will try to download OpenCL headers from github.com")
+    message("OpenCL_INCLUDE_DIRS is missing. Will try to download OpenCL headers from github.com")
     set(OpenCL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc")
     ExternalProject_Add(opencl-headers
             GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-Headers.git
@@ -34,7 +34,7 @@ else ()
 endif ()
 
 if (NOT OpenCL_LIBRARIES)
-    message("OpenCL_LIBRARIES is missed. Will try to download OpenCL ICD Loader from github.com")
+    message("OpenCL_LIBRARIES is missing. Will try to download OpenCL ICD Loader from github.com")
     if (MSVC)
         set(OpenCL_LIBRARIES
                 "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}OpenCL${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -54,7 +54,7 @@ if (NOT OpenCL_LIBRARIES)
             -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
             -DOPENCL_ICD_LOADER_HEADERS_DIR=${OpenCL_INCLUDE_DIRS}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
-            -DCMAKE_INSTALL_LIBDIR:PATH=lib
+            -DCMAKE_INSTALL_LIBDIR:PATH=lib${LLVM_LIBDIR_SUFFIX}
             ${OPENCL_ICD_LOADER_WDK}
             STEP_TARGETS configure,build,install
             DEPENDS opencl-headers
@@ -73,7 +73,7 @@ set(LLVM_LINK_COMPONENTS
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/inc
                     ${CMAKE_CURRENT_SOURCE_DIR}/include
         )
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}
                  ${CMAKE_CURRENT_BINARY_DIR}
         )
 file(GLOB TARGET_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp)

diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
 include(ExternalProject)
 
 if( NOT OpenCL_INCLUDE_DIRS )
-  message("OpenCL_INCLUDE_DIRS is missed. Will try to download OpenCL headers from github.com")
+  message("OpenCL_INCLUDE_DIRS is missing. Will try to download OpenCL headers from github.com")
   set(OpenCL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc")
   ExternalProject_Add(ocl-headers
     GIT_REPOSITORY    https://github.com/KhronosGroup/OpenCL-Headers.git
@@ -88,7 +88,7 @@ else()
 endif()
 
 if( NOT OpenCL_LIBRARIES )
-  message("OpenCL_LIBRARIES is missed. Will try to download OpenCL ICD Loader from github.com")
+  message("OpenCL_LIBRARIES is missing. Will try to download OpenCL ICD Loader from github.com")
   if(MSVC)
     set(OpenCL_LIBRARIES
         "${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}OpenCL${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -113,7 +113,7 @@ if( NOT OpenCL_LIBRARIES )
                -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                -DOPENCL_ICD_LOADER_HEADERS_DIR=${OpenCL_INCLUDE_DIRS}
                -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR}
-               -DCMAKE_INSTALL_LIBDIR:PATH=lib
+               -DCMAKE_INSTALL_LIBDIR:PATH=lib${LLVM_LIBDIR_SUFFIX}
                ${AUX_CMAKE_FLAGS}
     STEP_TARGETS      configure,build,install
     DEPENDS           ocl-headers