Jelajahi Sumber

HADOOP-10631. Native Hadoop Client: make clean should remove pb-c.h.s files (decstery via cmccabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HADOOP-10388@1598082 13f79535-47bb-0310-9956-ffa450edef68
Colin McCabe 11 tahun lalu
induk
melakukan
46b26638a8
1 mengubah file dengan 4 tambahan dan 3 penghapusan
  1. 4 3
      hadoop-native-core/GenerateProtobufs.cmake

+ 4 - 3
hadoop-native-core/GenerateProtobufs.cmake

@@ -23,11 +23,12 @@ function(DECLARE_PROTOS OUTPUT_SRC_LIST GENERATOR_DIR INCLUDE_DIRS)
         get_filename_component(BASENAME_F ${PB_FILE} NAME_WE)
         get_filename_component(BASENAME_F ${PB_FILE} NAME_WE)
         set(PB_C_FILE "${GENERATOR_DIR}/${BASENAME_F}.pb-c.c")
         set(PB_C_FILE "${GENERATOR_DIR}/${BASENAME_F}.pb-c.c")
         set(PB_H_FILE "${GENERATOR_DIR}/${BASENAME_F}.pb-c.h")
         set(PB_H_FILE "${GENERATOR_DIR}/${BASENAME_F}.pb-c.h")
+        set(PB_H_S_FILE "${GENERATOR_DIR}/${BASENAME_F}.pb-c.h.s")
         set(CALL_C_FILE "${GENERATOR_DIR}/${BASENAME_F}.call.c")
         set(CALL_C_FILE "${GENERATOR_DIR}/${BASENAME_F}.call.c")
         set(CALL_H_FILE "${GENERATOR_DIR}/${BASENAME_F}.call.h")
         set(CALL_H_FILE "${GENERATOR_DIR}/${BASENAME_F}.call.h")
         execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${GENERATOR_DIR})
         execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${GENERATOR_DIR})
         add_custom_command(
         add_custom_command(
-            OUTPUT ${PB_C_FILE} ${PB_H_FILE} ${CALL_C_FILE} ${CALL_H_FILE}
+            OUTPUT ${PB_C_FILE} ${PB_H_FILE} ${CALL_C_FILE} ${CALL_H_FILE} ${PB_H_S_FILE}
             COMMAND  ${PROTOBUFC_EXE}
             COMMAND  ${PROTOBUFC_EXE}
                 ARGS --c_out  ${GENERATOR_DIR} ${INCLUDE_FLAGS} --proto_path ${DIRNAME_F} ${ABSNAME_F}
                 ARGS --c_out  ${GENERATOR_DIR} ${INCLUDE_FLAGS} --proto_path ${DIRNAME_F} ${ABSNAME_F}
                 COMMENT "Running protoc-c on ${PB_FILE}"
                 COMMENT "Running protoc-c on ${PB_FILE}"
@@ -45,8 +46,8 @@ function(DECLARE_PROTOS OUTPUT_SRC_LIST GENERATOR_DIR INCLUDE_DIRS)
                 VERBATIM
                 VERBATIM
             )
             )
         list(APPEND CFILES ${PB_C_FILE} ${CALL_C_FILE})
         list(APPEND CFILES ${PB_C_FILE} ${CALL_C_FILE})
-        list(APPEND HFILES ${PB_H_FILE} ${PB_H_FILE}.s ${CALL_H_FILE})
-        set_source_files_properties(${PB_C_FILE} ${PB_H_FILE} "${PB_H_FILE}.s" PROPERTIES GENERATED TRUE)
+        list(APPEND HFILES ${PB_H_FILE} ${PB_H_S_FILE} ${CALL_H_FILE})
+        set_source_files_properties(${PB_C_FILE} ${PB_H_FILE} "${PB_H_S_FILE}" PROPERTIES GENERATED TRUE)
     endforeach()
     endforeach()
     #MESSAGE(STATUS "OUTPUT_SRC_LIST = ${OUTPUT_SRC_LIST}, CFILES = ${CFILES}, HFILES = ${HFILES}")
     #MESSAGE(STATUS "OUTPUT_SRC_LIST = ${OUTPUT_SRC_LIST}, CFILES = ${CFILES}, HFILES = ${HFILES}")
     set(${OUTPUT_SRC_LIST} ${CFILES} ${HFILES} PARENT_SCOPE)
     set(${OUTPUT_SRC_LIST} ${CFILES} ${HFILES} PARENT_SCOPE)