kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindProtobuf: Search x64 directories in VS-built protobuf source ()

Browse Source 
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.
This commit is contained in:
A. Joël Lamotte 2015-07-08 02:18:38 +02:00 committed by Brad King
parent 422d3f68de
commit 8dc6cbcb24
1 changed files with 11 additions and 6 deletions

17
Modules/FindProtobuf.cmake

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