Skip to content

Commit 223b9d8

Browse files
committed
Merge branch 'main' of https://github.com/triton-inference-server/client into yinggeh-DLIS-6657-client-input-byte-size-check
2 parents 2a5c507 + e859a99 commit 223b9d8

File tree

1 file changed

+47
-45
lines changed

1 file changed

+47
-45
lines changed

src/c++/library/CMakeLists.txt

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER OR TRITON_ENABLE_EXAMPLE
7575
target_compile_options(
7676
${_json_target} PRIVATE
7777
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
78-
-Wall -Wextra -Wno-unused-parameter -Werror>
78+
-Wall -Wextra -Werror>
7979
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
8080
)
8181

@@ -126,55 +126,57 @@ target_link_libraries(
126126
client-common-library
127127
)
128128

129-
add_library(
130-
shm_utils_static STATIC
131-
$<TARGET_OBJECTS:shm-utils-library>
132-
)
133-
134-
add_library(
135-
TritonClient::shm_utils_static ALIAS shm_utils_static
136-
)
137-
138-
foreach(_shm_target shm-utils-library shm_utils_static)
139-
target_compile_features(${_shm_target} PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD})
140-
target_compile_options(
141-
${_shm_target} PRIVATE
142-
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
143-
-Wall -Wextra -Wno-unused-parameter -Werror>
144-
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
129+
if(NOT WIN32)
130+
add_library(
131+
shm_utils_static STATIC
132+
$<TARGET_OBJECTS:shm-utils-library>
145133
)
146134

147-
set_target_properties(
148-
${_shm_target}
149-
PROPERTIES
150-
POSITION_INDEPENDENT_CODE ON
135+
add_library(
136+
TritonClient::shm_utils_static ALIAS shm_utils_static
151137
)
152138

153-
target_include_directories(
154-
${_shm_target}
155-
PUBLIC
156-
$<INSTALL_INTERFACE:include>
157-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
158-
PRIVATE
159-
${CMAKE_CURRENT_SOURCE_DIR}
160-
)
139+
foreach(_shm_target shm-utils-library shm_utils_static)
140+
target_compile_features(${_shm_target} PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD})
141+
target_compile_options(
142+
${_shm_target} PRIVATE
143+
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
144+
-Wall -Wextra -Werror>
145+
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
146+
)
147+
148+
set_target_properties(
149+
${_shm_target}
150+
PROPERTIES
151+
POSITION_INDEPENDENT_CODE ON
152+
)
153+
154+
target_include_directories(
155+
${_shm_target}
156+
PUBLIC
157+
$<INSTALL_INTERFACE:include>
158+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
159+
PRIVATE
160+
${CMAKE_CURRENT_SOURCE_DIR}
161+
)
162+
163+
install(
164+
FILES
165+
${CMAKE_CURRENT_SOURCE_DIR}/shm_utils.h
166+
DESTINATION include
167+
)
168+
endforeach()
161169

162170
install(
163-
FILES
164-
${CMAKE_CURRENT_SOURCE_DIR}/shm_utils.h
165-
DESTINATION include
171+
TARGETS
172+
shm_utils_static
173+
EXPORT
174+
triton-client-targets
175+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
176+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
177+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
166178
)
167-
endforeach()
168-
169-
install(
170-
TARGETS
171-
shm_utils_static
172-
EXPORT
173-
triton-client-targets
174-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
175-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
176-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
177-
)
179+
endif(NOT WIN32)
178180

179181
if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
180182
#
@@ -260,7 +262,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
260262
target_compile_options(
261263
${_client_target} PRIVATE
262264
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
263-
-Wall -Wextra -Wno-unused-parameter -Werror>
265+
-Wall -Wextra -Werror>
264266
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
265267
)
266268

@@ -443,7 +445,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
443445
target_compile_options(
444446
${_client_target} PRIVATE
445447
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
446-
-Wall -Wextra -Wno-unused-parameter -Werror>
448+
-Wall -Wextra -Werror>
447449
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
448450
)
449451

0 commit comments

Comments
 (0)