Install examples along with OCCA (#792)

* Install all the codegen files together
* Minor refactoring in CMakeListst.txt
* Install examples

Author: thilinarmtb

cmake/CodeGen.cmake

@@ -29,15 +29,8 @@ else()
 endif()
 
 # Set installtion of files required in header
-install(
-  FILES ${OCCA_BUILD_DIR}/include/codegen/kernelOperators.cpp_codegen
-  DESTINATION include/codegen)
-install(
- FILES ${OCCA_BUILD_DIR}/include/codegen/kernelOperators.hpp_codegen
- DESTINATION include/codegen)
-install(
-  FILES ${OCCA_BUILD_DIR}/include/codegen/macros.hpp_codegen
-  DESTINATION include/codegen)
-install(
-  FILES ${OCCA_BUILD_DIR}/include/codegen/runFunction.cpp_codegen
+install(FILES ${OCCA_BUILD_DIR}/include/codegen/kernelOperators.cpp_codegen
+  ${OCCA_BUILD_DIR}/include/codegen/kernelOperators.hpp_codegen
+  ${OCCA_BUILD_DIR}/include/codegen/macros.hpp_codegen
+  ${OCCA_BUILD_DIR}/include/codegen/runFunction.cpp_codegen
   DESTINATION include/codegen)

examples/CMakeLists.txt

@@ -30,47 +30,44 @@ macro(add_test_without_mode exe)
   set_property(TEST ${exe} APPEND PROPERTY ENVIRONMENT OCCA_CACHE_DIR=${OCCA_BUILD_DIR}/occa)
 endmacro()
 
-macro(compile_c_example target file)
-  add_executable(examples_c_${target} ${file})
-  target_link_libraries(examples_c_${target} libocca)
-  target_include_directories(examples_c_${target} PRIVATE
-    $<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
-  if (OCCA_ENABLE_TESTS)
-    add_test_with_modes(examples_c_${target})
+macro(compile_example target file mode)
+  add_executable(${target} ${file})
+  target_link_libraries(${target} libocca)
+  target_include_directories(${target} PRIVATE $<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
+
+  file(RELATIVE_PATH install_dir ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_LIST_DIR})
+  file(GLOB_RECURSE OKLS "${CMAKE_CURRENT_LIST_DIR}/*.okl")
+  install(TARGETS ${target} DESTINATION ${install_dir})
+  install(FILES ${OKLS} DESTINATION ${install_dir})
+
+  if (NOT DEFINED OCCA_ENABLE_TESTS)
+    return()
+  endif()
+  if (${mode})
+    add_test_with_modes(${target})
+  else()
+    add_test_without_mode(${target})
   endif()
 endmacro()
 
+macro(compile_c_example target file)
+  compile_example(examples_c_${target} ${file} TRUE)
+endmacro()
+
 macro(compile_cpp_example target file)
-  add_executable(examples_cpp_${target} ${file})
-  target_link_libraries(examples_cpp_${target} libocca)
-  target_include_directories(examples_cpp_${target} PRIVATE
-    $<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
-  if (OCCA_ENABLE_TESTS)
-    add_test_without_mode(examples_cpp_${target})
-  endif()
+  compile_example(examples_cpp_${target} ${file} FALSE)
 endmacro()
 
 macro(compile_cpp_example_with_modes target file)
-  add_executable(examples_cpp_${target} ${file})
-  target_link_libraries(examples_cpp_${target} libocca)
-  target_include_directories(examples_cpp_${target} PRIVATE
-    $<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
-  if (OCCA_ENABLE_TESTS)
-    add_test_with_modes(examples_cpp_${target})
-  endif()
+  compile_example(examples_cpp_${target} ${file} TRUE)
+endmacro()
+
+macro(compile_fortran_example_with_modes target file)
+  compile_example(examples_fortran_${target} ${file} TRUE)
 endmacro()
 
 add_subdirectory(c)
 add_subdirectory(cpp)
-
 if (OCCA_ENABLE_FORTRAN)
-  macro(compile_fortran_example_with_modes target file)
-    add_executable(examples_fortran_${target} ${file})
-    target_link_libraries(examples_fortran_${target} libocca)
-    if (OCCA_ENABLE_TESTS)
-      add_test_with_modes(examples_fortran_${target})
-    endif()
-  endmacro()
-
   add_subdirectory(fortran)
 endif()

examples/cpp/31_oklt_v3_moving_avg/CMakeLists.txt

@@ -4,7 +4,6 @@ add_custom_target(cpp_example_oklt_v3_moving_avg_cpy ALL
 	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/constants.h constants.h
 	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/movingAverage.okl movingAverage.okl)
 add_dependencies(examples_cpp_oklt_v3_moving_avg cpp_example_oklt_v3_moving_avg_cpy)
-target_sources(examples_cpp_oklt_v3_moving_avg 
-	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/movingAverage.okl
-        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/constants.h
-	)
+target_sources(examples_cpp_oklt_v3_moving_avg
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/movingAverage.okl
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/constants.h)

examples/cpp/CMakeLists.txt

@@ -12,16 +12,14 @@ add_subdirectory(12_native_opencl_kernels)
 add_subdirectory(13_openmp_interop)
 add_subdirectory(14_cuda_interop)
 add_subdirectory(17_memory_pool)
-
+# Don't force-compile OpenGL examples
+# add_subdirectory(16_finite_difference)
+# add_subdirectory(17_mandelbulb)
 add_subdirectory(18_nonblocking_streams)
 add_subdirectory(19_stream_tags)
 add_subdirectory(20_native_dpcpp_kernel)
 add_subdirectory(30_device_function)
 
-
-if (OCCA_CLANG_BASED_TRANSPILER)
+if (NOT DEFINED OCCA_CLANG_BASED_TRANSPILER)
   add_subdirectory(31_oklt_v3_moving_avg)
 endif()
-# Don't force-compile OpenGL examples
-# add_subdirectory(16_finite_difference)
-# add_subdirectory(17_mandelbulb)