From 825c19fdfbc4fe73283929e8a056163a7388b809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=2E=20Jo=C3=ABl=20Lamotte?= <mjklaim@gmail.com>
Date: Wed, 8 Jul 2015 02:18:38 +0200
Subject: [PATCH] FindProtobuf: Added 64 bit binaries search for Visual Studio
 projects.

Fixes #14833

Targets Protobuf 2.6.x and lesser versions which do not use CMake
(cmake is usable in Protobuf 3.x) but provide legacy Visual Studio
projects files;
---
 Modules/FindProtobuf.cmake | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index f01bd41..4349ba4 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -9,8 +9,9 @@
 # ``PROTOBUF_SRC_ROOT_FOLDER``
 #   When compiling with MSVC, if this cache variable is set
 #   the protobuf-default VS project build locations
-#   (vsprojects/Debug & vsprojects/Release) will be searched
-#   for libraries and binaries.
+#   (vsprojects/Debug & vsprojects/Release
+#   or vsprojects/x/64Debug & vsprojects/x64/Release)
+#   will be searched for libraries and binaries.
 # ``PROTOBUF_IMPORT_DIRS``
 #   List of additional directories to be searched for
 #   imported .proto files.
@@ -146,18 +147,25 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
   set(${HDRS} ${${HDRS}} PARENT_SCOPE)
 endfunction()
 
+  
+set( PROTOBUF_OUTPUT_BINARIES_DIR ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects )
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  set( PROTOBUF_OUTPUT_BINARIES_DIR ${PROTOBUF_OUTPUT_BINARIES_DIR}/x64 )
+endif()
+
 # Internal function: search for normal library as well as a debug one
 #    if the debug one is specified also include debug/optimized keywords
 #    in *_LIBRARIES variable
 function(_protobuf_find_libraries name filename)
+ 
    find_library(${name}_LIBRARY
        NAMES ${filename}
-       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Release)
+       PATHS ${PROTOBUF_OUTPUT_BINARIES_DIR}/Release)
    mark_as_advanced(${name}_LIBRARY)
 
    find_library(${name}_LIBRARY_DEBUG
        NAMES ${filename}
-       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Debug)
+       PATHS ${PROTOBUF_OUTPUT_BINARIES_DIR}/Debug)
    mark_as_advanced(${name}_LIBRARY_DEBUG)
 
    if(NOT ${name}_LIBRARY_DEBUG)
@@ -234,8 +242,8 @@ find_program(PROTOBUF_PROTOC_EXECUTABLE
     NAMES protoc
     DOC "The Google Protocol Buffers Compiler"
     PATHS
-    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Release
-    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Debug
+    ${PROTOBUF_OUTPUT_BINARIES_DIR}/Release
+    ${PROTOBUF_OUTPUT_BINARIES_DIR}/Debug
 )
 mark_as_advanced(PROTOBUF_PROTOC_EXECUTABLE)
 
-- 
1.9.5.msysgit.1

From bf2bb5044d9db24258f92b68a9ea0913f0f975d4 Mon Sep 17 00:00:00 2001
Message-Id: <bf2bb5044d9db24258f92b68a9ea0913f0f975d4.1436365517.git.brad.king@kitware.com>
From: =?UTF-8?q?A=2E=20Jo=C3=ABl=20Lamotte?= <mjklaim@gmail.com>
Date: Wed, 8 Jul 2015 02:18:38 +0200
Subject: [PATCH] FindProtobuf: Search x64 directories in VS-built protobuf
 source (#14833)

Protobuf 2.6.x and lower do not use CMake (cmake is usable in Protobuf
3.x) but provide legacy Visual Studio projects files.  Search their
output directories in 64-bit builds.
---
 Modules/FindProtobuf.cmake | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index f01bd41..335c408 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -9,8 +9,9 @@
 # ``PROTOBUF_SRC_ROOT_FOLDER``
 #   When compiling with MSVC, if this cache variable is set
 #   the protobuf-default VS project build locations
-#   (vsprojects/Debug & vsprojects/Release) will be searched
-#   for libraries and binaries.
+#   (vsprojects/Debug and vsprojects/Release
+#   or vsprojects/x64/Debug and vsprojects/x64/Release)
+#   will be searched for libraries and binaries.
 # ``PROTOBUF_IMPORT_DIRS``
 #   List of additional directories to be searched for
 #   imported .proto files.
@@ -146,18 +147,22 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
   set(${HDRS} ${${HDRS}} PARENT_SCOPE)
 endfunction()
 
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(_PROTOBUF_ARCH_DIR x64/)
+endif()
+
 # Internal function: search for normal library as well as a debug one
 #    if the debug one is specified also include debug/optimized keywords
 #    in *_LIBRARIES variable
 function(_protobuf_find_libraries name filename)
    find_library(${name}_LIBRARY
        NAMES ${filename}
-       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Release)
+       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release)
    mark_as_advanced(${name}_LIBRARY)
 
    find_library(${name}_LIBRARY_DEBUG
        NAMES ${filename}
-       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Debug)
+       PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
    mark_as_advanced(${name}_LIBRARY_DEBUG)
 
    if(NOT ${name}_LIBRARY_DEBUG)
@@ -234,8 +239,8 @@ find_program(PROTOBUF_PROTOC_EXECUTABLE
     NAMES protoc
     DOC "The Google Protocol Buffers Compiler"
     PATHS
-    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Release
-    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Debug
+    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release
+    ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug
 )
 mark_as_advanced(PROTOBUF_PROTOC_EXECUTABLE)
 
-- 
2.1.4