Skip to content

Commit 289acfa

Browse files
author
chengduo
authored
refien generic_cmake_ (#13457)
1 parent 155ebbb commit 289acfa

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

cmake/generic.cmake

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ function(merge_static_libs TARGET_NAME)
211211
set(libfiles ${libfiles} $<TARGET_FILE:${lib}>)
212212
#endif()
213213
endforeach()
214-
214+
215215
# windows cmd return error in clean env.
216216
# COMMAND del "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${TARGET_NAME}.lib"
217217
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@@ -255,7 +255,7 @@ function(cc_library TARGET_NAME)
255255
target_link_libraries(${TARGET_NAME} ${cc_library_DEPS})
256256
add_dependencies(${TARGET_NAME} ${cc_library_DEPS})
257257
endif()
258-
258+
259259
# cpplint code style
260260
foreach(source_file ${cc_library_SRCS})
261261
string(REGEX REPLACE "\\.[^.]*$" "" source ${source_file})
@@ -298,11 +298,10 @@ function(cc_test TARGET_NAME)
298298
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
299299
if (${cc_test_SERIAL})
300300
set_property(TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1)
301-
301+
endif()
302302
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cpu_deterministic=true)
303303
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true)
304304
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true)
305-
endif()
306305
endif()
307306
endfunction(cc_test)
308307

@@ -366,11 +365,10 @@ function(nv_test TARGET_NAME)
366365
add_test(${TARGET_NAME} ${TARGET_NAME})
367366
if (nv_test_SERIAL)
368367
set_property(TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1)
369-
368+
endif()
370369
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cpu_deterministic=true)
371370
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true)
372371
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true)
373-
endif()
374372
endif()
375373
endfunction(nv_test)
376374

@@ -558,26 +556,26 @@ function(paddle_protobuf_generate_cpp SRCS HDRS)
558556
set(${HDRS})
559557

560558
if (MOBILE_INFERENCE)
561-
set(EXTRA_FLAG "lite:")
559+
set(EXTRA_FLAG "lite:")
562560
else()
563-
set(EXTRA_FLAG "")
561+
set(EXTRA_FLAG "")
564562
endif()
565563

566564
foreach(FIL ${ARGN})
567565
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
568566
get_filename_component(FIL_WE ${FIL} NAME_WE)
569-
567+
570568
set(_protobuf_protoc_src "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
571569
set(_protobuf_protoc_hdr "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
572570
list(APPEND ${SRCS} "${_protobuf_protoc_src}")
573571
list(APPEND ${HDRS} "${_protobuf_protoc_hdr}")
574-
572+
575573
add_custom_command(
576574
OUTPUT "${_protobuf_protoc_src}"
577575
"${_protobuf_protoc_hdr}"
578576

579577
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}"
580-
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
578+
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
581579
-I${CMAKE_CURRENT_SOURCE_DIR}
582580
--cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL}
583581
DEPENDS ${ABS_FIL} protoc
@@ -646,7 +644,7 @@ function(grpc_library TARGET_NAME)
646644
get_filename_component(PROTO_PATH ${ABS_PROTO} PATH)
647645

648646
#FIXME(putcn): the follwoing line is supposed to generate *.pb.h and cc, but
649-
# somehow it didn't. line 602 to 604 is to patching this. Leaving this here
647+
# somehow it didn't. line 602 to 604 is to patching this. Leaving this here
650648
# for now to enable dist CI.
651649
protobuf_generate_cpp(grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO}")
652650
set(grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.cc")

0 commit comments

Comments
 (0)