Skip to content

Commit 6d24d4b

Browse files
authored
Fix flatcc path for Windows (#8970)
1 parent 352416e commit 6d24d4b

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

devtools/CMakeLists.txt

+14-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ if(NOT CMAKE_CXX_STANDARD)
2020
endif()
2121

2222
if(NOT FLATCC_EXECUTABLE)
23-
set(FLATCC_EXECUTABLE ${_flatcc_source_dir}/bin/flatcc)
23+
if(WIN32)
24+
set(FLATCC_EXECUTABLE ${_flatcc_source_dir}/bin/${CMAKE_BUILD_TYPE}/flatcc)
25+
else()
26+
set(FLATCC_EXECUTABLE ${_flatcc_source_dir}/bin/flatcc)
27+
endif()
2428
endif()
2529

2630
# Source root directory for executorch.
@@ -159,6 +163,12 @@ file(MAKE_DIRECTORY
159163
${_program_schema__include_dir}/executorch/devtools/bundled_program
160164
)
161165

166+
if(WIN32)
167+
set(RM_COMMAND rmdir /s /q)
168+
else()
169+
set(RM_COMMAND rm -rf)
170+
endif()
171+
162172
add_custom_command(
163173
OUTPUT ${_etdump_schema__outputs}
164174
COMMAND
@@ -168,11 +178,13 @@ add_custom_command(
168178
${FLATCC_EXECUTABLE} -cwr -o
169179
${_program_schema__include_dir}/executorch/devtools/etdump
170180
${_etdump_schema__srcs}
171-
COMMAND rm -rf ${_etdump_schema_cleanup_paths}
181+
COMMAND ${RM_COMMAND} ${_etdump_schema_cleanup_paths}
172182
DEPENDS ${_etdump_schema_gen_dep}
173183
COMMENT "Generating etdump headers"
174184
)
175185

186+
unset(RM_COMMAND)
187+
176188
add_library(
177189
etdump ${CMAKE_CURRENT_SOURCE_DIR}/etdump/etdump_flatcc.cpp
178190
${CMAKE_CURRENT_SOURCE_DIR}/etdump/emitter.cpp

0 commit comments

Comments
 (0)