Commit fe92e60c authored by Joseph Noir's avatar Joseph Noir

Fix variable names to match new find script.

parent 9c3af63c
...@@ -5,7 +5,7 @@ project(caf_opencl C CXX) ...@@ -5,7 +5,7 @@ project(caf_opencl C CXX)
# e.g., for creating proper Xcode projects # e.g., for creating proper Xcode projects
file(GLOB LIBCAF_OPENCL_HDRS "caf/opencl/*.hpp") file(GLOB LIBCAF_OPENCL_HDRS "caf/opencl/*.hpp")
if (OPENCL_LIBRARIES) if (OpenCL_LIBRARIES)
# list cpp files excluding platform-dependent files # list cpp files excluding platform-dependent files
set (LIBCAF_OPENCL_SRCS set (LIBCAF_OPENCL_SRCS
src/global.cpp src/global.cpp
...@@ -17,10 +17,10 @@ if (OPENCL_LIBRARIES) ...@@ -17,10 +17,10 @@ if (OPENCL_LIBRARIES)
if(NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes") if(NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes")
add_library(libcaf_opencl SHARED ${LIBCAF_OPENCL_SRCS} add_library(libcaf_opencl SHARED ${LIBCAF_OPENCL_SRCS}
${LIBCAF_OPENCL_HDRS} ${LIBCAF_OPENCL_HDRS}
${OPENCL_INCLUDE_DIR}) ${OpenCL_INCLUDE_DIRS})
target_link_libraries(libcaf_opencl ${LD_FLAGS} target_link_libraries(libcaf_opencl ${LD_FLAGS}
${LIBCAF_CORE_LIBRARY} ${LIBCAF_CORE_LIBRARY}
${OPENCL_LIBRARIES}) ${OpenCL_LIBRARIES})
set(LIBRARY_SOVERSION "${CAF_VERSION_MAJOR}") set(LIBRARY_SOVERSION "${CAF_VERSION_MAJOR}")
set_target_properties(libcaf_opencl set_target_properties(libcaf_opencl
PROPERTIES PROPERTIES
......
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(caf_examples_opencl CXX) project(caf_examples_opencl CXX)
if(OPENCL_LIBRARIES) if(OpenCL_LIBRARIES)
add_custom_target(opencl_examples) add_custom_target(opencl_examples)
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories(${LIBCAF_INCLUDE_DIRS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Window") if(${CMAKE_SYSTEM_NAME} MATCHES "Window")
...@@ -16,7 +16,7 @@ if(OPENCL_LIBRARIES) ...@@ -16,7 +16,7 @@ if(OPENCL_LIBRARIES)
${LIBCAF_LIBRARIES} ${LIBCAF_LIBRARIES}
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${WSLIB} ${WSLIB}
${OPENCL_LIBRARIES}) ${OpenCL_LIBRARIES})
add_dependencies(${name} all_examples) add_dependencies(${name} all_examples)
endmacro() endmacro()
add(proper_matrix .) add(proper_matrix .)
......
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(caf_unit_tests_opencl CXX) project(caf_unit_tests_opencl CXX)
if (OPENCL_LIBRARIES) if (OpenCL_LIBRARIES)
add_custom_target(opencl_unit_tests) add_custom_target(opencl_unit_tests)
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories(${LIBCAF_INCLUDE_DIRS})
macro(add_unit_test name) macro(add_unit_test name)
...@@ -10,7 +10,7 @@ if (OPENCL_LIBRARIES) ...@@ -10,7 +10,7 @@ if (OPENCL_LIBRARIES)
${LD_FLAGS} ${LD_FLAGS}
${LIBCAF_LIBRARIES} ${LIBCAF_LIBRARIES}
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${OPENCL_LIBRARIES}) ${OpenCL_LIBRARIES})
add_test(${name} ${EXECUTABLE_OUTPUT_PATH}/test_${name}) add_test(${name} ${EXECUTABLE_OUTPUT_PATH}/test_${name})
add_dependencies(test_${name} all_unit_tests) add_dependencies(test_${name} all_unit_tests)
endmacro() endmacro()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment