Skip to content

Commit 6ec2ea0

Browse files
authored
[cherry-pick] fix cmake expressions error #33621
cherry-pick #32815
1 parent 370fb10 commit 6ec2ea0

File tree

1 file changed

+21
-6
lines changed

1 file changed

+21
-6
lines changed

cmake/external/warpctc.cmake

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,21 @@ if(WITH_ASCEND OR WITH_ASCEND_CL)
7878
-DCMAKE_INSTALL_PREFIX:PATH=${WARPCTC_INSTALL_DIR}
7979
)
8080
else()
81+
if(WIN32)
82+
set(WARPCTC_C_FLAGS $<FILTER:${CMAKE_C_FLAGS},EXCLUDE,/Zc:inline>)
83+
set(WARPCTC_C_FLAGS_DEBUG $<FILTER:${CMAKE_C_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
84+
set(WARPCTC_C_FLAGS_RELEASE $<FILTER:${CMAKE_C_FLAGS_RELEASE},EXCLUDE,/Zc:inline>)
85+
set(WARPCTC_CXX_FLAGS $<FILTER:${CMAKE_CXX_FLAGS},EXCLUDE,/Zc:inline>)
86+
set(WARPCTC_CXX_FLAGS_RELEASE $<FILTER:${CMAKE_CXX_FLAGS_RELEASE},EXCLUDE,/Zc:inline>)
87+
set(WARPCTC_CXX_FLAGS_DEBUG $<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
88+
else()
89+
set(WARPCTC_C_FLAGS ${CMAKE_C_FLAGS})
90+
set(WARPCTC_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
91+
set(WARPCTC_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
92+
set(WARPCTC_CXX_FLAGS ${CMAKE_CXX_FLAGS})
93+
set(WARPCTC_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
94+
set(WARPCTC_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
95+
endif()
8196
ExternalProject_Add(
8297
extern_warpctc
8398
${EXTERNAL_PROJECT_LOG_ARGS}
@@ -90,12 +105,12 @@ else()
90105
BUILD_ALWAYS 1
91106
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
92107
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
93-
-DCMAKE_C_FLAGS=$<FILTER:${CMAKE_C_FLAGS},EXCLUDE,/Zc:inline>
94-
-DCMAKE_C_FLAGS_DEBUG=$<FILTER:${CMAKE_C_FLAGS_DEBUG},EXCLUDE,/Zc:inline>
95-
-DCMAKE_C_FLAGS_RELEASE=$<FILTER:${CMAKE_C_FLAGS_RELEASE},EXCLUDE,/Zc:inline>
96-
-DCMAKE_CXX_FLAGS=$<FILTER:${CMAKE_CXX_FLAGS},EXCLUDE,/Zc:inline>
97-
-DCMAKE_CXX_FLAGS_RELEASE=$<FILTER:${CMAKE_CXX_FLAGS_RELEASE},EXCLUDE,/Zc:inline>
98-
-DCMAKE_CXX_FLAGS_DEBUG=$<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>
108+
-DCMAKE_C_FLAGS=${WARPCTC_C_FLAGS}
109+
-DCMAKE_C_FLAGS_DEBUG=${WARPCTC_C_FLAGS_DEBUG}
110+
-DCMAKE_C_FLAGS_RELEASE=${WARPCTC_C_FLAGS_RELEASE}
111+
-DCMAKE_CXX_FLAGS=${WARPCTC_CXX_FLAGS}
112+
-DCMAKE_CXX_FLAGS_RELEASE=${WARPCTC_CXX_FLAGS_RELEASE}
113+
-DCMAKE_CXX_FLAGS_DEBUG=${WARPCTC_CXX_FLAGS_DEBUG}
99114
-DCMAKE_INSTALL_PREFIX=${WARPCTC_INSTALL_DIR}
100115
-DWITH_GPU=${WITH_GPU}
101116
-DWITH_ROCM=${WITH_ROCM}

0 commit comments

Comments
 (0)