[Cmake-commits] CMake branch, next, updated. v3.3.0-2137-gfbe703a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fbe703adf5f78d050c3317ad338add067a0889d6 (commit)
       via  8dc6cbcb248979a10ba96c9e7ce19fe18f009586 (commit)
      from  4c8cbce8b9a875e4d34544dded53ba0db1891eb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbe703adf5f78d050c3317ad338add067a0889d6
commit fbe703adf5f78d050c3317ad338add067a0889d6
Merge: 4c8cbce 8dc6cbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 11 08:58:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 11 08:58:51 2015 -0400

    Merge topic 'FindProtobuf-vs-x64' into next
    
    8dc6cbcb FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc6cbcb248979a10ba96c9e7ce19fe18f009586
commit 8dc6cbcb248979a10ba96c9e7ce19fe18f009586
Author:     A. Joël Lamotte <mjklaim at gmail.com>
AuthorDate: Wed Jul 8 02:18:38 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 08:57:21 2015 -0400

    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.

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)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindProtobuf.cmake |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake