diff --git a/cmake_modules/ProtobufConfig.cmake b/cmake_modules/ProtobufConfig.cmake
index bfc1a2d07751464a0d9ad106651cfc48af6db65d..379ed4e997212e92255b29223aec2daa8f5cef4b 100644
--- a/cmake_modules/ProtobufConfig.cmake
+++ b/cmake_modules/ProtobufConfig.cmake
@@ -63,12 +63,12 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
     get_filename_component(FIL_WE ${FIL} NAME_WE)
     
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.cpp")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.h")
 
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
+    add_custom_target(pb
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.cpp"
+             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.h"
       COMMAND  ${PROTOBUF_PROTOC_EXECUTABLE}
       ARGS --cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
       DEPENDS ${ABS_FIL}