@@ -211,7 +211,7 @@ function(merge_static_libs TARGET_NAME)
211
211
set (libfiles ${libfiles} $< TARGET_FILE:${lib} > )
212
212
#endif()
213
213
endforeach ()
214
-
214
+
215
215
# windows cmd return error in clean env.
216
216
# COMMAND del "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${TARGET_NAME}.lib"
217
217
add_custom_command (TARGET ${TARGET_NAME} POST_BUILD
@@ -255,7 +255,7 @@ function(cc_library TARGET_NAME)
255
255
target_link_libraries (${TARGET_NAME} ${cc_library_DEPS} )
256
256
add_dependencies (${TARGET_NAME} ${cc_library_DEPS} )
257
257
endif ()
258
-
258
+
259
259
# cpplint code style
260
260
foreach (source_file ${cc_library_SRCS} )
261
261
string (REGEX REPLACE "\\ .[^.]*$" "" source ${source_file} )
@@ -298,11 +298,10 @@ function(cc_test TARGET_NAME)
298
298
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
299
299
if (${cc_test_SERIAL} )
300
300
set_property (TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1 )
301
-
301
+ endif ()
302
302
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cpu_deterministic=true )
303
303
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true )
304
304
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true )
305
- endif ()
306
305
endif ()
307
306
endfunction (cc_test )
308
307
@@ -366,11 +365,10 @@ function(nv_test TARGET_NAME)
366
365
add_test (${TARGET_NAME} ${TARGET_NAME} )
367
366
if (nv_test_SERIAL )
368
367
set_property (TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1 )
369
-
368
+ endif ()
370
369
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cpu_deterministic=true )
371
370
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true )
372
371
set_property (TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true )
373
- endif ()
374
372
endif ()
375
373
endfunction (nv_test )
376
374
@@ -558,26 +556,26 @@ function(paddle_protobuf_generate_cpp SRCS HDRS)
558
556
set (${HDRS} )
559
557
560
558
if (MOBILE_INFERENCE )
561
- set (EXTRA_FLAG "lite:" )
559
+ set (EXTRA_FLAG "lite:" )
562
560
else ()
563
- set (EXTRA_FLAG "" )
561
+ set (EXTRA_FLAG "" )
564
562
endif ()
565
563
566
564
foreach (FIL ${ARGN} )
567
565
get_filename_component (ABS_FIL ${FIL} ABSOLUTE )
568
566
get_filename_component (FIL_WE ${FIL} NAME_WE )
569
-
567
+
570
568
set (_protobuf_protoc_src "${CMAKE_CURRENT_BINARY_DIR} /${FIL_WE} .pb.cc" )
571
569
set (_protobuf_protoc_hdr "${CMAKE_CURRENT_BINARY_DIR} /${FIL_WE} .pb.h" )
572
570
list (APPEND ${SRCS} "${_protobuf_protoc_src} " )
573
571
list (APPEND ${HDRS} "${_protobuf_protoc_hdr} " )
574
-
572
+
575
573
add_custom_command (
576
574
OUTPUT "${_protobuf_protoc_src} "
577
575
"${_protobuf_protoc_hdr} "
578
576
579
577
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR} "
580
- COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
578
+ COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
581
579
-I${CMAKE_CURRENT_SOURCE_DIR}
582
580
--cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR} " ${ABS_FIL}
583
581
DEPENDS ${ABS_FIL} protoc
@@ -646,7 +644,7 @@ function(grpc_library TARGET_NAME)
646
644
get_filename_component (PROTO_PATH ${ABS_PROTO} PATH )
647
645
648
646
#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
650
648
# for now to enable dist CI.
651
649
protobuf_generate_cpp (grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO} " )
652
650
set (grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR} /${PROTO_WE} .grpc.pb.cc" )
0 commit comments