@@ -20,40 +20,39 @@ include(FindPackageHandleStandardArgs)
2020# Search path priority
2121# 1. CMake Variable LEVEL_ZERO_DIR
2222# 2. Environment Variable LEVEL_ZERO_DIR
23-
2423if (NOT LEVEL_ZERO_DIR)
2524 if (DEFINED ENV{LEVEL_ZERO_DIR})
2625 set (LEVEL_ZERO_DIR "$ENV{LEVEL_ZERO_DIR} " )
2726 endif ()
2827endif ()
2928
3029if (LEVEL_ZERO_DIR)
31- find_path (LevelZero_INCLUDE_DIR
30+ find_path (LevelZeroRuntime_INCLUDE_DIR
3231 NAMES level_zero/ze_api.h
3332 PATHS ${LEVEL_ZERO_DIR} /include
3433 NO_DEFAULT_PATH
3534 )
3635
3736 if (LINUX)
38- find_library (LevelZero_LIBRARY
37+ find_library (LevelZeroRuntime_LIBRARY
3938 NAMES ze_loader
4039 PATHS ${LEVEL_ZERO_DIR} /lib
41- ${LEVEL_ZERO_DIR} /lib/x86_64-linux-gnu
40+ ${LEVEL_ZERO_DIR} /lib/x86_64-linux-gnu
4241 NO_DEFAULT_PATH
4342 )
4443 else ()
45- find_library (LevelZero_LIBRARY
44+ find_library (LevelZeroRuntime_LIBRARY
4645 NAMES ze_loader
4746 PATHS ${LEVEL_ZERO_DIR} /lib
4847 NO_DEFAULT_PATH
4948 )
5049 endif ()
5150else ()
52- find_path (LevelZero_INCLUDE_DIR
51+ find_path (LevelZeroRuntime_INCLUDE_DIR
5352 NAMES level_zero/ze_api.h
5453 )
5554
56- find_library (LevelZero_LIBRARY
55+ find_library (LevelZeroRuntime_LIBRARY
5756 NAMES ze_loader
5857 )
5958endif ()
@@ -64,12 +63,14 @@ endif()
6463# lists of equal lengths, with the shorter string getting zero-padded.
6564function (compare_versions VERSION_STR1 VERSION_STR2 OUTPUT )
6665 # Convert the strings to list
67- string (REPLACE "." ";" VL1 ${VERSION_STR1} )
68- string (REPLACE "." ";" VL2 ${VERSION_STR2} )
66+ string (REPLACE "." ";" VL1 ${VERSION_STR1} )
67+ string (REPLACE "." ";" VL2 ${VERSION_STR2} )
68+
6969 # get lengths of both lists
7070 list (LENGTH VL1 VL1_LEN)
7171 list (LENGTH VL2 VL2_LEN)
7272 set (LEN ${VL1_LEN} )
73+
7374 # If they differ in size pad the shorter list with 0s
7475 if (VL1_LEN GREATER VL2_LEN)
7576 math (EXPR DIFF "${VL1_LEN} - ${VL2_LEN} " OUTPUT_FORMAT DECIMAL)
@@ -98,12 +99,10 @@ function(compare_versions VERSION_STR1 VERSION_STR2 OUTPUT)
9899 set (${OUTPUT} TRUE PARENT_SCOPE)
99100 endif ()
100101 endforeach ()
101-
102- endfunction (compare_versions)
102+ endfunction (compare_versions)
103103
104104# Creates a small function to run and extract the LevelZero loader version.
105105function (get_l0_loader_version)
106-
107106 set (L0_VERSIONEER_SRC
108107 [====[
109108 #include <iostream>
@@ -142,19 +141,20 @@ function(get_l0_loader_version)
142141
143142 # We need both the directories in the include path as ze_loader.h
144143 # includes "ze_api.h" and not "level_zero/ze_api.h".
145- list (APPEND INCLUDE_DIRS ${LevelZero_INCLUDE_DIR } )
146- list (APPEND INCLUDE_DIRS ${LevelZero_INCLUDE_DIR } /level_zero)
144+ list (APPEND INCLUDE_DIRS ${LevelZeroRuntime_INCLUDE_DIR } )
145+ list (APPEND INCLUDE_DIRS ${LevelZeroRuntime_INCLUDE_DIR } /level_zero)
147146 list (JOIN INCLUDE_DIRS ";" INCLUDE_DIRS_STR)
148147 try_run (L0_VERSIONEER_RUN L0_VERSIONEER_COMPILE
149- "${CMAKE_BINARY_DIR} "
150- "${L0_VERSIONEER_FILE} "
151- LINK_LIBRARIES ${LevelZero_LIBRARY }
152- CMAKE_FLAGS
153- "-DINCLUDE_DIRECTORIES=${INCLUDE_DIRS_STR} "
154- RUN_OUTPUT_VARIABLE L0_VERSION
148+ "${CMAKE_BINARY_DIR} "
149+ "${L0_VERSIONEER_FILE} "
150+ LINK_LIBRARIES ${LevelZeroRuntime_LIBRARY }
151+ CMAKE_FLAGS
152+ "-DINCLUDE_DIRECTORIES=${INCLUDE_DIRS_STR} "
153+ RUN_OUTPUT_VARIABLE L0_VERSION
155154 )
156- if (${L0_VERSIONEER_COMPILE} AND (DEFINED L0_VERSIONEER_RUN))
157- set (LevelZero_VERSION ${L0_VERSION} PARENT_SCOPE)
155+
156+ if (${L0_VERSIONEER_COMPILE} AND (DEFINED L0_VERSIONEER_RUN))
157+ set (LevelZeroRuntime_VERSION ${L0_VERSION} PARENT_SCOPE)
158158 message (STATUS "Found Level Zero of version: ${L0_VERSION} " )
159159 else ()
160160 message (FATAL_ERROR
@@ -163,59 +163,61 @@ function(get_l0_loader_version)
163163 endif ()
164164endfunction (get_l0_loader_version)
165165
166- if (LevelZero_INCLUDE_DIR AND LevelZero_LIBRARY)
167- list (APPEND LevelZero_LIBRARIES "${LevelZero_LIBRARY} " )
168- list (APPEND LevelZero_INCLUDE_DIRS ${LevelZero_INCLUDE_DIR} )
166+ if (LevelZeroRuntime_INCLUDE_DIR AND LevelZeroRuntime_LIBRARY)
167+ list (APPEND LevelZeroRuntime_LIBRARIES "${LevelZeroRuntime_LIBRARY} " )
168+ list (APPEND LevelZeroRuntime_INCLUDE_DIRS ${LevelZeroRuntime_INCLUDE_DIR} )
169+
169170 if (OpenCL_FOUND)
170- list (APPEND LevelZero_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS} )
171+ list (APPEND LevelZeroRuntime_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS} )
171172 endif ()
172173
173- cmake_path(GET LevelZero_LIBRARY PARENT_PATH LevelZero_LIBRARIES_PATH )
174- set (LevelZero_LIBRARIES_DIR ${LevelZero_LIBRARIES_PATH } )
175-
176- if (NOT TARGET LevelZero::LevelZero )
177- add_library (LevelZero::LevelZero INTERFACE IMPORTED )
178- set_target_properties (LevelZero::LevelZero
179- PROPERTIES INTERFACE_LINK_LIBRARIES "${LevelZero_LIBRARIES } "
180- )
181- set_target_properties (LevelZero::LevelZero
182- PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LevelZero_INCLUDE_DIRS } "
183- )
174+ cmake_path(GET LevelZeroRuntime_LIBRARY PARENT_PATH LevelZeroRuntime_LIBRARIES_PATH )
175+ set (LevelZeroRuntime_LIBRARIES_DIR ${LevelZeroRuntime_LIBRARIES_PATH } )
176+
177+ if (NOT TARGET LevelZeroRuntime::LevelZeroRuntime )
178+ add_library (LevelZeroRuntime::LevelZeroRuntime INTERFACE IMPORTED )
179+ set_target_properties (LevelZeroRuntime::LevelZeroRuntime
180+ PROPERTIES INTERFACE_LINK_LIBRARIES "${LevelZeroRuntime_LIBRARIES } "
181+ )
182+ set_target_properties (LevelZeroRuntime::LevelZeroRuntime
183+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LevelZeroRuntime_INCLUDE_DIRS } "
184+ )
184185 endif ()
185186endif ()
186187
187188# Check if a specific version of Level Zero is required
188- if (LevelZero_FIND_VERSION )
189+ if (LevelZeroRuntime_FIND_VERSION )
189190 get_l0_loader_version()
190191 set (VERSION_GT_FIND_VERSION FALSE )
191192 compare_versions(
192- ${LevelZero_VERSION }
193- ${LevelZero_FIND_VERSION }
193+ ${LevelZeroRuntime_VERSION }
194+ ${LevelZeroRuntime_FIND_VERSION }
194195 VERSION_GT_FIND_VERSION
195196 )
197+
196198 if (${VERSION_GT_FIND_VERSION} )
197- set (LevelZero_FOUND TRUE )
199+ set (LevelZeroRuntime_FOUND TRUE )
198200 else ()
199- set (LevelZero_FOUND FALSE )
201+ set (LevelZeroRuntime_FOUND FALSE )
200202 endif ()
201203else ()
202- set (LevelZero_FOUND TRUE )
204+ set (LevelZeroRuntime_FOUND TRUE )
203205endif ()
204206
205- find_package_handle_standard_args(LevelZero
207+ find_package_handle_standard_args(LevelZeroRuntime
206208 REQUIRED_VARS
207- LevelZero_FOUND
208- LevelZero_INCLUDE_DIRS
209- LevelZero_LIBRARY
210- LevelZero_LIBRARIES_DIR
209+ LevelZeroRuntime_FOUND
210+ LevelZeroRuntime_INCLUDE_DIRS
211+ LevelZeroRuntime_LIBRARY
212+ LevelZeroRuntime_LIBRARIES_DIR
211213 HANDLE_COMPONENTS
212214)
213- mark_as_advanced (LevelZero_LIBRARY LevelZero_INCLUDE_DIRS )
215+ mark_as_advanced (LevelZeroRuntime_LIBRARY LevelZeroRuntime_INCLUDE_DIRS )
214216
215- if (LevelZero_FOUND )
216- find_package_message(LevelZero "Found LevelZero: ${LevelZero_LIBRARY } "
217- "(found version ${LevelZero_VERSION } )"
217+ if (LevelZeroRuntime_FOUND )
218+ find_package_message(LevelZeroRuntime "Found LevelZero: ${LevelZeroRuntime_LIBRARY } "
219+ "(found version ${LevelZeroRuntime_VERSION } )"
218220 )
219221else ()
220- find_package_message(LevelZero "Could not find LevelZero" "" )
222+ find_package_message(LevelZeroRuntime "Could not find LevelZero" "" )
221223endif ()
0 commit comments