From 04265e40dadbaadf63242e24dfb8912fcfb02cce Mon Sep 17 00:00:00 2001
From: Walter Gray <wgray@leapmotion.com>
Date: Thu, 26 May 2016 18:04:32 -0700
Subject: [PATCH 1/3] Remove if(TRUE)

---
 cmake/install.cmake | 54 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/cmake/install.cmake b/cmake/install.cmake
index 6e3d41a177..a5040b2271 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -16,34 +16,32 @@ endforeach()
 install(TARGETS protoc EXPORT protobuf-targets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
 
-if(TRUE)
-  file(STRINGS extract_includes.bat.in _extract_strings
-    REGEX "^copy")
-  foreach(_extract_string ${_extract_strings})
-    string(REPLACE "copy \${PROTOBUF_SOURCE_WIN32_PATH}\\" ""
-      _extract_string ${_extract_string})
-    string(REPLACE "\\" "/" _extract_string ${_extract_string})
-    string(REGEX MATCH "^[^ ]+"
-      _extract_from ${_extract_string})
-    string(REGEX REPLACE "^${_extract_from} ([^$]+)" "\\1"
-      _extract_to ${_extract_string})
-    get_filename_component(_extract_from "${protobuf_SOURCE_DIR}/${_extract_from}" ABSOLUTE)
-    get_filename_component(_extract_name ${_extract_to} NAME)
-    get_filename_component(_extract_to ${_extract_to} PATH)
-    string(REPLACE "include/" "${CMAKE_INSTALL_INCLUDEDIR}/"
-      _extract_to "${_extract_to}")
-    if(EXISTS "${_extract_from}")
-      install(FILES "${_extract_from}"
-        DESTINATION "${_extract_to}"
-        COMPONENT protobuf-headers
-        RENAME "${_extract_name}")
-    else()
-      message(AUTHOR_WARNING "The file \"${_extract_from}\" is listed in "
-        "\"${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in\" "
-        "but there not exists. The file will not be installed.")
-    endif()
-  endforeach()
-endif()
+file(STRINGS extract_includes.bat.in _extract_strings
+  REGEX "^copy")
+foreach(_extract_string ${_extract_strings})
+  string(REPLACE "copy \${PROTOBUF_SOURCE_WIN32_PATH}\\" ""
+    _extract_string ${_extract_string})
+  string(REPLACE "\\" "/" _extract_string ${_extract_string})
+  string(REGEX MATCH "^[^ ]+"
+    _extract_from ${_extract_string})
+  string(REGEX REPLACE "^${_extract_from} ([^$]+)" "\\1"
+    _extract_to ${_extract_string})
+  get_filename_component(_extract_from "${protobuf_SOURCE_DIR}/${_extract_from}" ABSOLUTE)
+  get_filename_component(_extract_name ${_extract_to} NAME)
+  get_filename_component(_extract_to ${_extract_to} PATH)
+  string(REPLACE "include/" "${CMAKE_INSTALL_INCLUDEDIR}/"
+    _extract_to "${_extract_to}")
+  if(EXISTS "${_extract_from}")
+    install(FILES "${_extract_from}"
+      DESTINATION "${_extract_to}"
+      COMPONENT protobuf-headers
+      RENAME "${_extract_name}")
+  else()
+    message(AUTHOR_WARNING "The file \"${_extract_from}\" is listed in "
+      "\"${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in\" "
+      "but there not exists. The file will not be installed.")
+  endif()
+endforeach()
 
 # Internal function for parsing auto tools scripts
 function(_protobuf_auto_list FILE_NAME VARIABLE)

From d13b3d0d96e80638f6b393526182f9268f4b1234 Mon Sep 17 00:00:00 2001
From: Walter Gray <wgray@leapmotion.com>
Date: Thu, 26 May 2016 23:49:28 -0700
Subject: [PATCH 2/3] remove useless cleanup - config.cmake files are executed
 in their own context.

---
 cmake/protobuf-config.cmake.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index bb0997b88b..6efb068d18 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -21,7 +21,3 @@ get_filename_component(_PROTOBUF_IMPORT_PREFIX
 if(NOT DEFINED PROTOBUF_MODULE_COMPATIBLE OR "${PROTOBUF_MODULE_COMPATIBLE}")
   include("${_PROTOBUF_PACKAGE_PREFIX}/protobuf-module.cmake")
 endif()
-
-# Cleanup temporary variables.
-set(_PROTOBUF_PACKAGE_PREFIX)
-set(_PROTOBUF_IMPORT_PREFIX)

From 457a2975f4bff68412d8f4a57c329a5b54750672 Mon Sep 17 00:00:00 2001
From: Walter Gray <wgray@leapmotion.com>
Date: Sat, 28 May 2016 01:59:58 -0700
Subject: [PATCH 3/3] Remove __PROTOBUF_PACKAGE_PREFIX

---
 cmake/protobuf-config.cmake.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index 6efb068d18..f11796a47d 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -2,12 +2,8 @@
 set(PROTOBUF_VERSION        "@protobuf_VERSION@")
 set(PROTOBUF_VERSION_STRING "@protobuf_VERSION_STRING@")
 
-# Current dir
-get_filename_component(_PROTOBUF_PACKAGE_PREFIX
-  "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
 # Imported targets
-include("${_PROTOBUF_PACKAGE_PREFIX}/protobuf-targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
 
 # Compute the installation prefix relative to this file.
 get_filename_component(_PROTOBUF_IMPORT_PREFIX