@@ -45,7 +45,7 @@ set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
4545 "6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf" )
4646
4747include (ExternalProject)
48- externalproject_add (googleapis_download
48+ ExternalProject_Add (googleapis_download
4949 EXCLUDE_FROM_ALL ON
5050 PREFIX "${CMAKE_BINARY_DIR} /external/googleapis"
5151 URL ${GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL}
@@ -54,7 +54,7 @@ externalproject_add(googleapis_download
5454 BUILD_COMMAND ""
5555 INSTALL_COMMAND ""
5656 LOG_DOWNLOAD OFF )
57- externalproject_get_property (googleapis_download SOURCE_DIR)
57+ ExternalProject_Get_Property (googleapis_download SOURCE_DIR)
5858set (GOOGLEAPIS_CPP_SOURCE "${SOURCE_DIR} " )
5959
6060list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR} /cmake" )
@@ -267,23 +267,21 @@ install(TARGETS ${googleapis_cpp_installed_libraries_list}
267267
268268foreach (target ${googleapis_cpp_installed_libraries_list} )
269269 google_cloud_cpp_install_proto_library_headers("${target} " )
270- google_cloud_cpp_install_proto_library_protos("${target} " "${GOOGLEAPIS_CPP_SOURCE} " )
270+ google_cloud_cpp_install_proto_library_protos("${target} "
271+ "${GOOGLEAPIS_CPP_SOURCE} " )
271272endforeach ()
272273
273274# Export the CMake targets to make it easy to create configuration files.
274275install (EXPORT googleapis-targets
275276 DESTINATION "${CMAKE_INSTALL_LIBDIR} /cmake/googleapis" )
276277
277278# Setup global variables used in the following *.in files.
278- set (
279- GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${GOOGLEAPIS_CPP_PROTOS_VERSION_MAJOR}
280- )
281- set (
282- GOOGLE_CLOUD_CPP_CONFIG_VERSION_MINOR ${GOOGLEAPIS_CPP_PROTOS_VERSION_MINOR}
283- )
284- set (
285- GOOGLE_CLOUD_CPP_CONFIG_VERSION_PATCH ${GOOGLEAPIS_CPP_PROTOS_VERSION_PATCH}
286- )
279+ set (GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR
280+ ${GOOGLEAPIS_CPP_PROTOS_VERSION_MAJOR} )
281+ set (GOOGLE_CLOUD_CPP_CONFIG_VERSION_MINOR
282+ ${GOOGLEAPIS_CPP_PROTOS_VERSION_MINOR} )
283+ set (GOOGLE_CLOUD_CPP_CONFIG_VERSION_PATCH
284+ ${GOOGLEAPIS_CPP_PROTOS_VERSION_PATCH} )
287285
288286# Use a function to create a scope for the variables.
289287function (googleapis_cpp_install_pc target )
@@ -322,8 +320,8 @@ function (googleapis_cpp_install_pc target)
322320 string (CONCAT GOOGLE_CLOUD_CPP_PC_REQUIRES ${_target_pc_requires} )
323321 set (GOOGLE_CLOUD_CPP_PC_LIBS "-l${target} " )
324322 configure_file ("cmake/config.pc.in" "${target} .pc" @ONLY)
325- install (FILES "${CMAKE_CURRENT_BINARY_DIR} /${target} .pc" DESTINATION
326- "${CMAKE_INSTALL_LIBDIR} /pkgconfig" )
323+ install (FILES "${CMAKE_CURRENT_BINARY_DIR} /${target} .pc"
324+ DESTINATION "${CMAKE_INSTALL_LIBDIR} /pkgconfig" )
327325endfunction ()
328326
329327# Create and install the pkg-config files.
@@ -355,8 +353,8 @@ string(CONCAT GOOGLE_CLOUD_CPP_PC_REQUIRES
355353 " libcares" )
356354set (GOOGLE_CLOUD_CPP_PC_LIBS "" )
357355configure_file ("cmake/config.pc.in" "googleapis.pc" @ONLY)
358- install (FILES "${CMAKE_CURRENT_BINARY_DIR} /googleapis.pc" DESTINATION
359- "${CMAKE_INSTALL_LIBDIR} /pkgconfig" )
356+ install (FILES "${CMAKE_CURRENT_BINARY_DIR} /googleapis.pc"
357+ DESTINATION "${CMAKE_INSTALL_LIBDIR} /pkgconfig" )
360358
361359# Create and install the CMake configuration files.
362360configure_file ("cmake/config.cmake.in" "googleapis-config.cmake" @ONLY)
@@ -367,5 +365,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/googleapis-config.cmake"
367365 "${PROJECT_SOURCE_DIR} /cmake/FindgRPC.cmake"
368366 "${PROJECT_SOURCE_DIR} /cmake/FindProtobufTargets.cmake"
369367 "${PROJECT_SOURCE_DIR} /cmake/CompileProtos.cmake"
370- DESTINATION
371- "${CMAKE_INSTALL_LIBDIR} /cmake/googleapis" )
368+ DESTINATION "${CMAKE_INSTALL_LIBDIR} /cmake/googleapis" )
0 commit comments