Skip to content

Commit 7a62958

Browse files
committed
Handle any CMAKE_DL_LIBS
1 parent abb9196 commit 7a62958

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ set_target_properties (OpenCL PROPERTIES VERSION 1\.0\.0 SOVERSION "1")
127127

128128
if (WIN32)
129129
target_link_libraries (OpenCL PRIVATE cfgmgr32.lib runtimeobject.lib)
130-
string(APPEND OPENCL_LIBS_PRIVATE_PC " -lcfgmgr32 -lruntimeobject")
130+
list(APPEND OPENCL_LIBS_PRIVATE_PC cfgmgr32 runtimeobject)
131131

132132
# Generate a DLL without a "lib" prefix for mingw.
133133
if (MINGW OR MSYS OR CYGWIN)
@@ -136,7 +136,7 @@ if (WIN32)
136136
endif()
137137
else()
138138
target_link_libraries (OpenCL PRIVATE ${CMAKE_THREAD_LIBS_INIT})
139-
string(APPEND OPENCL_LIBS_PRIVATE_PC " ${CMAKE_THREAD_LIBS_INIT}")
139+
list(APPEND OPENCL_LIBS_PRIVATE_PC ${CMAKE_THREAD_LIBS_INIT})
140140
if (NOT APPLE)
141141
set_target_properties (OpenCL PROPERTIES LINK_FLAGS "-Wl,--version-script -Wl,${CMAKE_CURRENT_SOURCE_DIR}/loader/linux/icd_exports.map")
142142
if (OPENCL_ICD_LOADER_PIC)
@@ -179,8 +179,8 @@ target_include_directories (OpenCL
179179
loader
180180
)
181181
target_link_libraries (OpenCL PUBLIC ${CMAKE_DL_LIBS})
182-
if(CMAKE_DL_LIBS STREQUAL "dl")
183-
string(APPEND OPENCL_LIBS_PRIVATE_PC " -ldl")
182+
if(CMAKE_DL_LIBS)
183+
list(APPEND OPENCL_LIBS_PRIVATE_PC ${CMAKE_DL_LIBS})
184184
endif()
185185

186186
if (ENABLE_OPENCL_LAYERINFO)
@@ -302,4 +302,7 @@ install (TARGETS OpenCL
302302
DESTINATION ${CMAKE_INSTALL_LIBDIR}
303303
COMPONENT dev
304304
NAMELINK_ONLY)
305+
306+
list(TRANSFORM OPENCL_LIBS_PRIVATE_PC PREPEND " -l")
307+
list(JOIN OPENCL_LIBS_PRIVATE_PC "" OPENCL_LIBS_PRIVATE_PC)
305308
install_opencl_pc()

0 commit comments

Comments
 (0)