Skip to content

Commit 2973a25

Browse files
build: Adding b64 dependency to relevant targets (fix L0_build_variants) (#7855) (#7882)
Co-authored-by: KrishnanPrash <140860868+KrishnanPrash@users.noreply.github.com>
1 parent 4df3160 commit 2973a25

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

src/CMakeLists.txt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if (NOT WIN32)
118118
endif()
119119

120120
target_compile_features(main PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD})
121-
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
121+
if(WIN32)
122122
message("Using MSVC as compiler, default target on Windows 10. "
123123
"If the target system is not Windows 10, please update _WIN32_WINNT "
124124
"to corresponding value.")
@@ -130,13 +130,30 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
130130
target_compile_definitions(main
131131
PRIVATE
132132
NOMINMAX)
133+
134+
# Dependency from common.h
135+
find_library(B64_LIBRARY NAMES b64)
136+
target_link_libraries(
137+
main
138+
PRIVATE
139+
${B64_LIBRARY}
140+
)
141+
133142
else()
143+
134144
target_compile_options(
135145
main
136146
PRIVATE
137147
-Wall -Wextra -Wno-unused-parameter -Wno-deprecated-declarations -Werror
138148
)
139-
endif()
149+
150+
# Dependency from common.h
151+
target_link_libraries(
152+
main
153+
PRIVATE
154+
b64
155+
)
156+
endif()
140157

141158
set(LIB_DIR "lib")
142159
if(LINUX)

src/python/tritonfrontend/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ set(
5959
../../shared_memory_manager.h
6060
../../shared_memory_manager.cc
6161
../../data_compressor.h
62-
../../common.h
63-
../../common.cc
6462
../../restricted_features.h
6563
../../classification.cc
64+
../../common.h
65+
../../common.cc
6666
)
6767

68-
set(PY_BINDING_DEPENDENCY_LIBS)
68+
set(PY_BINDING_DEPENDENCY_LIBS
69+
b64) # Dependency from common.h
6970

7071
# Conditional Linking Based on Flags
7172
if(${TRITON_ENABLE_HTTP})

0 commit comments

Comments
 (0)