update cmake files in preparation for header and ICD loader updates (#10)

* update cmake files in preparation for header and ICD loader updates

There are updates in flight for the headers and the ICD loader that
require corresponding updates to the extension loader.  This change
still works with older headers and ICD loaders, but will also work
with the updates in flight.

* don't try to find OpenCL if header and lib variables already exist

* fix include type for OpenCL headers

Author: bashbaug

CMakeLists.txt

@@ -18,24 +18,29 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
+# Note: cmake 3.7 is needed to use OpenCL::OpenCL.
+# Older versions may work by explicitly specifying OpenCL_INCLUDE_DIRS and OpenCL_LIBRARIES.
+cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_CXX_STANDARD 11)
 
-project(OpenCLExtensionLoader LANGUAGES C CXX)
+project(OpenCLExtensionLoader
+    VERSION 0.9
+    LANGUAGES C CXX)
 
 option (BUILD_SHARED_LIBS "Build shared libs" ON)
-option (OPENCL_EXTENSION_LOADER_FORCE_STATIC_LIB "Unconditionally build a static library for the OpenCL Extension Loader" ON)
+option (OPENCL_EXTENSION_LOADER_FORCE_STATIC_LIB "Unconditionally Build a Static Library" ON)
 option (OPENCL_EXTENSION_LOADER_SINGLE_PLATFORM_ONLY "Only Support Extensions from a Single OpenCL Platform" OFF)
+option (OPENCL_EXTENSION_LOADER_INSTALL         "Generate Installation Target" ON)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_GL      "Include OpenGL Extension APIs" ON)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_EGL     "Include EGL Extension APIs" ON)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_DX9     "Include DirectX 9 Extension APIs" OFF)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_D3D10   "Include Direct3D 10 Extension APIs" OFF)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_D3D11   "Include Direct3D 11 Extension APIs" OFF)
 option (OPENCL_EXTENSION_LOADER_INCLUDE_VA_API  "Include VA_API Extension APIs" OFF)
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     include(CTest)
     find_package(Python3 COMPONENTS Interpreter)
     set(OPENCL_EXTENSION_LOADER_XML_PATH CACHE FILEPATH "Path to cl.xml for OpenCL Extension Loader genereration")
@@ -59,8 +64,18 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     set_target_properties(extension_loader_copy PROPERTIES FOLDER "OpenCLExtensionLoader/Generation")
 endif()
 
-if(NOT DEFINED OpenCL_INCLUDE_DIRS)
-    find_package(OpenCL)
+if (OpenCL_INCLUDE_DIRS AND OpenCL_LIBRARIES)
+    message(STATUS "Using inherited OpenCL_INCLUDE_DIRS and OpenCL_LIBRARIES")
+    set(OPENCL_EXTENSION_LOADER_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS})
+    set(OPENCL_EXTENSION_LOADER_LIBRARIES ${OpenCL_LIBRARIES})
+else()
+    if (NOT TARGET OpenCL::OpenCL)
+        find_package(OpenCL)
+    endif()
+    if (NOT TARGET OpenCL::OpenCL)
+        message(STATUS "OpenCL was not found!")
+    endif()
+    set(OPENCL_EXTENSION_LOADER_LIBRARIES OpenCL::OpenCL)
 endif()
 
 set( OpenCLExtensionLoader_SOURCE_FILES
@@ -74,9 +89,10 @@ if (OPENCL_EXTENSION_LOADER_FORCE_STATIC_LIB)
 else()
     add_library(OpenCLExt ${OpenCLExtensionLoader_SOURCE_FILES})
 endif()
+add_library(OpenCL::OpenCLExt ALIAS OpenCLExt)
 set_target_properties(OpenCLExt PROPERTIES FOLDER "OpenCLExtensionLoader")
 set_target_properties(OpenCLExt PROPERTIES VERSION "0.9" SOVERSION "0")
-target_include_directories(OpenCLExt SYSTEM PUBLIC ${OpenCL_INCLUDE_DIRS})
+target_include_directories(OpenCLExt PRIVATE ${OPENCL_EXTENSION_LOADER_INCLUDE_DIRS})
 target_compile_definitions(OpenCLExt PRIVATE CL_TARGET_OPENCL_VERSION=300)
 if (OPENCL_EXTENSION_LOADER_SINGLE_PLATFORM_ONLY)
     target_compile_definitions(OpenCLExt PRIVATE CLEXT_SINGLE_PLATFORM_ONLY)
@@ -99,9 +115,9 @@ endif()
 if (OPENCL_EXTENSION_LOADER_INCLUDE_VA_API)
     target_compile_definitions(OpenCLExt PRIVATE CLEXT_INCLUDE_VA_API)
 endif()
-target_link_libraries(OpenCLExt PRIVATE ${OpenCL_LIBRARIES})
+target_link_libraries(OpenCLExt PRIVATE ${OPENCL_EXTENSION_LOADER_LIBRARIES})
 
-if(MSVC)
+if (MSVC)
     #/EHs enable C++ EH (no SEH exceptions)
     #/EHc extern "C" defaults to nothrow
     target_compile_options(OpenCLExt PRIVATE /EHs- /EHc-)
@@ -110,17 +126,49 @@ else()
 endif()
 
 include(GNUInstallDirs)
-install(TARGETS OpenCLExt
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
+include(CMakePackageConfigHelpers)
+
+if (OPENCL_EXTENSION_LOADER_INSTALL)
+    set(OPENCL_EXTENSION_LOADER_CONFIG_PATH "${CMAKE_INSTALL_DATADIR}/cmake/OpenCLExtensionLoader")
+
+    install(TARGETS OpenCLExt
+        EXPORT OpenCLExtensionLoaderTargets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
+
+    export(EXPORT OpenCLExtensionLoaderTargets
+        FILE ${CMAKE_CURRENT_BINARY_DIR}/OpenCLExtensionLoader/OpenCLExtensionLoaderTargets.cmake
+        NAMESPACE OpenCL::
+    )
+    install(EXPORT OpenCLExtensionLoaderTargets
+        FILE OpenCLExtensionLoaderTargets.cmake
+        NAMESPACE OpenCL::
+        DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH}
+    )
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/OpenCLExtensionLoader/OpenCLExtensionLoaderConfig.cmake
+        "include(\"\${CMAKE_CURRENT_LIST_DIR}/OpenCLExtensionLoaderTargets.cmake\")"
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLExtensionLoader/OpenCLExtensionLoaderConfig.cmake
+        DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH}
+    )
+
+    write_basic_package_version_file(
+        ${CMAKE_CURRENT_BINARY_DIR}/OpenCLExtensionLoader/OpenCLExtensionLoaderConfigVersion.cmake
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLExtensionLoader/OpenCLExtensionLoaderConfigVersion.cmake
+        DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH}
+    )
+endif()
+
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "Install Path" FORCE)
 endif()
-

tests/CMakeLists.txt

@@ -2,7 +2,7 @@ foreach(VERSION 120 200 210 220 300)
     set(TEST_EXE test_extension_loader_cpp_${VERSION})
     add_executable(${TEST_EXE} test_extension_loader.cpp)
     set_target_properties(${TEST_EXE} PROPERTIES FOLDER "OpenCLExtensionLoader/Tests")
-    target_include_directories(${TEST_EXE} PUBLIC ${OpenCL_INCLUDE_DIRS})
+    target_include_directories(${TEST_EXE} PUBLIC ${OPENCL_EXTENSION_LOADER_INCLUDE_DIRS})
     target_compile_definitions(${TEST_EXE} PUBLIC -DCL_TARGET_OPENCL_VERSION=${VERSION})
     if (OPENCL_EXTENSION_LOADER_INCLUDE_GL)
         target_compile_definitions(${TEST_EXE} PRIVATE CLEXT_INCLUDE_GL)
@@ -22,15 +22,15 @@ foreach(VERSION 120 200 210 220 300)
     if (OPENCL_EXTENSION_LOADER_INCLUDE_VA_API)
         target_compile_definitions(${TEST_EXE} PRIVATE CLEXT_INCLUDE_VA_API)
     endif()
-    target_link_libraries(${TEST_EXE} PUBLIC ${OpenCL_LIBRARY} OpenCLExt)
+    target_link_libraries(${TEST_EXE} PUBLIC ${OPENCL_EXTENSION_LOADER_LIBRARIES} OpenCLExt)
     add_test(NAME ${TEST_EXE} COMMAND ${TEST_EXE})
 endforeach(VERSION)
 
 foreach(VERSION 120 200 210 220 300)
     set(TEST_EXE test_extension_loader_c_${VERSION})
     add_executable(${TEST_EXE} test_extension_loader.c)
     set_target_properties(${TEST_EXE} PROPERTIES FOLDER "OpenCLExtensionLoader/Tests")
-    target_include_directories(${TEST_EXE} PUBLIC ${OpenCL_INCLUDE_DIRS})
+    target_include_directories(${TEST_EXE} PUBLIC ${OPENCL_EXTENSION_LOADER_INCLUDE_DIRS})
     target_compile_definitions(${TEST_EXE} PUBLIC -DCL_TARGET_OPENCL_VERSION=${VERSION})
     if (OPENCL_EXTENSION_LOADER_INCLUDE_GL)
         target_compile_definitions(${TEST_EXE} PRIVATE CLEXT_INCLUDE_GL)
@@ -50,7 +50,7 @@ foreach(VERSION 120 200 210 220 300)
     if (OPENCL_EXTENSION_LOADER_INCLUDE_VA_API)
         target_compile_definitions(${TEST_EXE} PRIVATE CLEXT_INCLUDE_VA_API)
     endif()
-    target_link_libraries(${TEST_EXE} PUBLIC ${OpenCL_LIBRARY} OpenCLExt)
+    target_link_libraries(${TEST_EXE} PUBLIC ${OPENCL_EXTENSION_LOADER_LIBRARIES} OpenCLExt)
     add_test(NAME ${TEST_EXE} COMMAND ${TEST_EXE})
 endforeach(VERSION)