Fix cmake integration for AdaptiveCpp

YUZHIGUIYI · Oct 31, 2023 · d0d1bb5 · d0d1bb5
1 parent ac1beb0
commit d0d1bb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,8 +75,8 @@ if (SYCL_ACADEMY_USE_ADAPTIVECPP)
     "the path to the root of the chosen SYCL implementation using "
     "SYCL_ACADEMY_INSTALL_ROOT=<path/to/install/root>.")
   endif()
-  set(hipSYCL_DIR ${SYCL_ACADEMY_INSTALL_ROOT}/lib/cmake/hipSYCL)
-  find_package(hipSYCL CONFIG REQUIRED PATHS)
+  set(AdaptiveCpp_DIR ${SYCL_ACADEMY_INSTALL_ROOT}/lib/cmake/AdaptiveCpp)
+  find_package(AdaptiveCpp CONFIG REQUIRED PATHS)
 endif()
 
 # Exercises

diff --git a/Code_Exercises/CMakeLists.txt b/Code_Exercises/CMakeLists.txt
@@ -11,8 +11,10 @@
 # CMake function to build ab AdaptiveCpp configuration and create executable binaries
 # from AdaptiveCpp libraries. 
 function( add_sycl_executable_adaptivecpp prefix source )
-  add_executable("${prefix}_${source}" "${source}.cpp")
-  target_compile_definitions("${prefix}_${source}" PUBLIC -DSYCL_LANGUAGE_VERSION=2020)
+  set(TARGET_NAME "${prefix}_${source}")
+  add_executable("${TARGET_NAME}" "${source}.cpp")
+  add_sycl_to_target(TARGET ${TARGET_NAME} SOURCES "${source}.cpp") 
+
   target_include_directories("${prefix}_${source}" PRIVATE
     ${PROJECT_SOURCE_DIR}/Utilities/include 
     ${PROJECT_SOURCE_DIR}/External/stb)