summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Martin <adam.madram@gmail.com>2016-10-10 19:17:10 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-10 19:44:21 (GMT)
commitd9190f3308fb67f01f061038a06006af73a77da1 (patch)
tree4dcdcd04c6cbee7e4c3cdc39cc72a5c6a16d57b9
parent656ebaca3be50e92edca3d9628b784f5ff1e6a99 (diff)
downloadCMake-d9190f3308fb67f01f061038a06006af73a77da1.zip
CMake-d9190f3308fb67f01f061038a06006af73a77da1.tar.gz
CMake-d9190f3308fb67f01f061038a06006af73a77da1.tar.bz2
FindProtobuf: Search for debug library named with `d` suffix
Protobuf now provides a CMake-based build system that optionally adds a suffix to the debug library name [1]. Update our `find_library` call to consider names with the default value for this suffix, `d`. [1] https://github.com/google/protobuf/blob/431cee60/cmake/libprotoc.cmake#L107
-rw-r--r--Modules/FindProtobuf.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 14e392a..3ffd5a7 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -264,7 +264,7 @@ function(_protobuf_find_libraries name filename)
mark_as_advanced(${name}_LIBRARY_RELEASE)
find_library(${name}_LIBRARY_DEBUG
- NAMES ${filename}
+ NAMES ${filename}d ${filename}
PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
mark_as_advanced(${name}_LIBRARY_DEBUG)