Merge pull request #1614 from yeswalrus/cmake-cleanup

Remove unused lines from CMake files.

cmake/install.cmake

@@ -16,10 +16,9 @@ endforeach()
 install(TARGETS protoc EXPORT protobuf-targets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
 
-if(TRUE)
-  file(STRINGS extract_includes.bat.in _extract_strings
+file(STRINGS extract_includes.bat.in _extract_strings
   REGEX "^copy")
-  foreach(_extract_string ${_extract_strings})
+foreach(_extract_string ${_extract_strings})
   string(REPLACE "copy \${PROTOBUF_SOURCE_WIN32_PATH}\\" ""
     _extract_string ${_extract_string})
   string(REPLACE "\\" "/" _extract_string ${_extract_string})
@@ -42,8 +41,7 @@ if(TRUE)
       "\"${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in\" "
       "but there not exists. The file will not be installed.")
   endif()
-  endforeach()
-endif()
+endforeach()
 
 # Internal function for parsing auto tools scripts
 function(_protobuf_auto_list FILE_NAME VARIABLE)

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
@@ -21,7 +17,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)