Integrate from internal code base.

1 files changed, 63 insertions, 63 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c9d46885..2cd2acc0 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,63 +1,63 @@
-# Minimum CMake required

-cmake_minimum_required(VERSION 2.8.12)

-

-# Project

-project(protobuf-examples)

-

-# Find required protobuf package

-find_package(protobuf CONFIG REQUIRED)

-

-if(protobuf_VERBOSE)

-  message(STATUS "Using Protocol Buffers ${Protobuf_VERSION}")

-endif()

-

-set(CMAKE_INCLUDE_CURRENT_DIR TRUE)

-

-# http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F

-if(MSVC AND protobuf_MSVC_STATIC_RUNTIME)

-  foreach(flag_var

-      CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

-      CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)

-    if(${flag_var} MATCHES "/MD")

-      string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")

-    endif(${flag_var} MATCHES "/MD")

-  endforeach()

-endif()

-

-foreach(example add_person list_people)

-  set(${example}_SRCS ${example}.cc)

-  set(${example}_PROTOS addressbook.proto)

-

-  #Code Generation

-  if(protobuf_MODULE_COMPATIBLE) #Legacy Support

-    protobuf_generate_cpp(${example}_PROTO_SRCS ${example}_PROTO_HDRS ${${example}_PROTOS})

-    list(APPEND ${example}_SRCS ${${example}_PROTO_SRCS} ${${example}_PROTO_HDRS})

-  else()

-

-    foreach(proto_file ${${example}_PROTOS})

-      get_filename_component(proto_file_abs ${proto_file} ABSOLUTE)

-      get_filename_component(basename ${proto_file} NAME_WE)

-      set(generated_files ${basename}.pb.cc ${basename}.pb.h)

-      list(APPEND ${example}_SRCS ${generated_files})

-

-      add_custom_command(

-        OUTPUT ${generated_files}

-        COMMAND protobuf::protoc

-        ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR} ${proto_file_abs}

-        COMMENT "Generating ${generated_files} from ${proto_file}"

-        VERBATIM

-      )

-    endforeach()

-  endif()

-

-  #Executable setup

-  set(executable_name ${example}_cpp)

-  add_executable(${executable_name} ${${example}_SRCS} ${${example}_PROTOS})

-  if(protobuf_MODULE_COMPATIBLE) #Legacy mode

-    target_include_directories(${executable_name} PUBLIC ${PROTOBUF_INCLUDE_DIRS})

-    target_link_libraries(${executable_name} ${PROTOBUF_LIBRARIES})

-  else()

-    target_link_libraries(${executable_name} protobuf::libprotobuf)

-  endif()

-

-endforeach()

+# Minimum CMake required
+cmake_minimum_required(VERSION 2.8.12)
+
+# Project
+project(protobuf-examples)
+
+# Find required protobuf package
+find_package(protobuf CONFIG REQUIRED)
+
+if(protobuf_VERBOSE)
+  message(STATUS "Using Protocol Buffers ${Protobuf_VERSION}")
+endif()
+
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
+# http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
+if(MSVC AND protobuf_MSVC_STATIC_RUNTIME)
+  foreach(flag_var
+      CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+      CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+    if(${flag_var} MATCHES "/MD")
+      string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+    endif(${flag_var} MATCHES "/MD")
+  endforeach()
+endif()
+
+foreach(example add_person list_people)
+  set(${example}_SRCS ${example}.cc)
+  set(${example}_PROTOS addressbook.proto)
+
+  #Code Generation
+  if(protobuf_MODULE_COMPATIBLE) #Legacy Support
+    protobuf_generate_cpp(${example}_PROTO_SRCS ${example}_PROTO_HDRS ${${example}_PROTOS})
+    list(APPEND ${example}_SRCS ${${example}_PROTO_SRCS} ${${example}_PROTO_HDRS})
+  else()
+
+    foreach(proto_file ${${example}_PROTOS})
+      get_filename_component(proto_file_abs ${proto_file} ABSOLUTE)
+      get_filename_component(basename ${proto_file} NAME_WE)
+      set(generated_files ${basename}.pb.cc ${basename}.pb.h)
+      list(APPEND ${example}_SRCS ${generated_files})
+
+      add_custom_command(
+        OUTPUT ${generated_files}
+        COMMAND protobuf::protoc
+        ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR} ${proto_file_abs}
+        COMMENT "Generating ${generated_files} from ${proto_file}"
+        VERBATIM
+      )
+    endforeach()
+  endif()
+
+  #Executable setup
+  set(executable_name ${example}_cpp)
+  add_executable(${executable_name} ${${example}_SRCS} ${${example}_PROTOS})
+  if(protobuf_MODULE_COMPATIBLE) #Legacy mode
+    target_include_directories(${executable_name} PUBLIC ${PROTOBUF_INCLUDE_DIRS})
+    target_link_libraries(${executable_name} ${PROTOBUF_LIBRARIES})
+  else()
+    target_link_libraries(${executable_name} protobuf::libprotobuf)
+  endif()
+
+endforeach()