Skip to content

Commit 93bb53c

Browse files
committed
GPU CMake: get rid of unnecessary temporary variable
1 parent 394e86f commit 93bb53c

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

GPU/GPUTracking/Base/cuda/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,10 @@ set(SRCS ${SRCS} ${GPU_RTC_BIN}.src.o ${GPU_RTC_BIN}.command.o ${GPU_RTC_BIN}.co
110110
# -------------------------------- End RTC -------------------------------------------------------
111111

112112
if(ALIGPU_BUILD_TYPE STREQUAL "O2")
113-
set(TMP_BASELIB O2::GPUTracking)
114113
o2_add_library(
115114
${MODULE}
116115
SOURCES ${SRCS}
117-
PUBLIC_LINK_LIBRARIES ${TMP_BASELIB} O2::ITStrackingCUDA
116+
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingCUDA
118117
PRIVATE_INCLUDE_DIRECTORIES
119118
${CMAKE_SOURCE_DIR}/Detectors/Base/src
120119
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
@@ -127,10 +126,9 @@ endif()
127126

128127
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
129128
set(targetName "${MODULE}")
130-
set(TMP_BASELIB GPUTracking)
131129
add_library(${MODULE} SHARED ${SRCS})
132130
add_library(O2::${MODULE} ALIAS ${MODULE})
133-
target_link_libraries(${MODULE} PUBLIC ${TMP_BASELIB})
131+
target_link_libraries(${MODULE} PUBLIC O2::GPUTracking)
134132
install(TARGETS GPUTrackingCUDA)
135133
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
136134
endif()

GPU/GPUTracking/Base/hip/CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,10 @@ set(SRCS ${SRCS} ${GPU_RTC_BIN}.src.o ${GPU_RTC_BIN}.command.o ${GPU_RTC_BIN}.co
148148
# -------------------------------- End RTC -------------------------------------------------------
149149

150150
if(ALIGPU_BUILD_TYPE STREQUAL "O2")
151-
set(TMP_BASELIB O2::GPUTracking)
152151
o2_add_library(
153152
${MODULE}
154153
SOURCES ${SRCS}
155-
PUBLIC_LINK_LIBRARIES ${TMP_BASELIB} O2::ITStrackingHIP
154+
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingHIP
156155
PRIVATE_INCLUDE_DIRECTORIES
157156
${CMAKE_SOURCE_DIR}/Detectors/Base/src
158157
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
@@ -171,20 +170,19 @@ endif()
171170

172171
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
173172
set(targetName "${MODULE}")
174-
set(TMP_BASELIB GPUTracking)
175173
add_library(${MODULE} SHARED ${SRCS})
176174
add_library(O2::${MODULE} ALIAS ${MODULE})
177-
target_link_libraries(${MODULE} PUBLIC ${TMP_BASELIB})
175+
target_link_libraries(${MODULE} PUBLIC O2::GPUTracking)
178176
install(TARGETS GPUTrackingHIP)
179177
include_directories(${GPUCA_HIP_SOURCE_DIR})
180178
endif()
181179

182180
target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
183181

184182
add_library(${MODULE}_CXX OBJECT ${SRCS_CXX}) # Adding a C++ library for the .cxx code of the HIP library, such that it does not link to HIP libraries, and CMake HIP Language doesn't add HIP compile flags.
185-
target_compile_definitions(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:${TMP_BASELIB},COMPILE_DEFINITIONS>)
186-
target_include_directories(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:${TMP_BASELIB},INCLUDE_DIRECTORIES>)
187-
target_link_libraries(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:${TMP_BASELIB},LINK_LIBRARIES>)
183+
target_compile_definitions(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
184+
target_include_directories(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,INCLUDE_DIRECTORIES>)
185+
target_link_libraries(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,LINK_LIBRARIES>)
188186
add_dependencies(${MODULE}_CXX O2::GPUTracking)
189187
target_link_libraries(${targetName} PRIVATE ${MODULE}_CXX)
190188

0 commit comments

Comments
 (0)