summaryrefslogtreecommitdiff
path: root/Modules/FindProtobuf.cmake
Commit message (Collapse)AuthorAgeFilesLines
* FindProtobuf: Do not verify protoc version if it is not foundDiego Pino Garcia2019-12-161-12/+14
|
* FindProtobuf: Fix usage of protobuf dynamic libraries on Windowsgnaggnoyil2019-07-181-0/+15
| | | | | | | | Define `PROTOBUF_USE_DLLS` on Windows when linking against dynamic protobuf libraries so that we import symbols from them. We use the condition `MSVC` to enable this because that is what the upstream buildsystem uses.
* FindProtobuf: libprotoc also needs C++11Rolf Eike Beer2019-07-031-0/+5
|
* FindProtobuf: C++11 support is required since version 3.6.0Rolf Eike Beer2019-06-251-0/+5
|
* Protobuf: Fix generated source path with PROTOBUF_GENERATE_CPP_APPEND_PATH OFFBob Weinand2019-05-081-1/+6
|
* CMakeParseArguments: Remove superfluous includes of CMakeParseArgumentsKyle Edwards2018-12-131-2/+0
| | | | | | | | | | | | | | Because cmake_parse_arguments() has been implemented as a native command, there is no need to include(CMakeParseArguments) anymore. Its inclusion has been removed from several CMake modules. Tests/CMakeOnly/CMakeLists.txt has been changed to include the *building* CMake's copy of CMakeParseArguments rather than the *built* CMake's copy. This file included the *built* copy because when this file was introduced, CMake could still be built with versions that didn't supply cmake_parse_arguments(). Now, CMake requires 3.1 or greater, where cmake_parse_arguments() existed but was still in the form of a module, so we include it from the *building* CMake.
* Merge topic 'FindProtobuf-threads'Brad King2018-11-011-14/+22
|\ | | | | | | | | | | | | 03454b0d0d FindProtobuf: Add missing link dependencies on threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2551
| * FindProtobuf: Add missing link dependencies on threadsBrad King2018-10-311-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf headers have dependencies on threads. On UNIX platforms this requires linking to a threads library. We've long done this in the `Protobuf_LIBRARIES` result variable. However, the imported targets added by commit v3.9.0-rc1~81^2~2 (FindProtobuf: add targets, 2017-05-17) and commit v3.9.0-rc1~68^2 (FindProtobuf: Rename imported targets to match upstream names, 2017-05-22) were missing a dependency on threads. Add the dependency to the imported targets, and to the variables `Protobuf_LITE_LIBRARIES` and `Protobuf_PROTOC_LIBRARIES`. While this did not seem to matter in practice for a long time, protobuf 3.6 throws exceptions in some cases when threads are missing. Fixes: #18533
* | Help: Convert remaining modules to block-style commentsKitware Robot2018-10-221-117/+118
|/
* Protobuf: restore previous output directoryAndré Apitzsch2018-07-161-2/+2
| | | | | The protobuf upstream implementation has a different default output directory. Restore our original output directory for compatibility.
* Protobuf: restore 'DESCRIPTORS' supportAndré Apitzsch2018-07-161-4/+23
| | | | This was not present in the upstream code.
* Protobuf: restore 'PROTOBUF_IMPORT_DIRS' checkAndré Apitzsch2018-07-161-0/+8
| | | | This was not present in the upstream code.
* Protobuf: use upstream implementation to generate cpp and python filesAndré Apitzsch2018-07-161-104/+121
| | | | | | | | | | Generate functions are taken from [1] and [2]. The license [3] is already covered by our BSD-3 license for CMake and our inclusion of "Google Inc" in `Copyright.txt`. [1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in [2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in [3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE
* FindProtobuf: fix documentation typoAndré Apitzsch2017-10-061-1/+1
| | | | | | Fix typo in documentation added by commit v3.10.0-rc1~18^2 (FindProtobuf: add flag to allow descriptor files to be generated, 2017-09-21).
* FindProtobuf: add flag to allow descriptor files to be generatedPeter Mitrano2017-10-021-3/+26
| | | | | | | | | | | - The .desc files will be in the same folder as the generated .cc and .h files. - Paths to generate .desc files are stored in a variable passed in - This is only implemented for C++ - Remove legacy ARGS - Add test that generates and uses C++ protobuf message - Add test that checks that the generated .desc file can be instantiated with DynamicMessageFactory - Add Help rst for new feature
* FindProtobuf: Refactor custom command output listingBrad King2017-10-021-7/+8
| | | | | | Reduce duplication by storing the custom command outputs in variables. Also, since custom command outputs are automatically marked as generated we do not need to do so explicitly.
* FindProtobuf: add target for protocAndré Apitzsch2017-07-121-4/+16
|
* FindProtobuf: add optional export declaration macro to generated cpp filesAndré Apitzsch2017-05-261-5/+16
|
* FindProtobuf: Rename imported targets to match upstream namesBrad King2017-05-221-27/+27
| | | | | | | | | Rename our recently added imported targets to match those provided by the upstream's CMake-based build. That way a project using `find_package(Protobuf)` can get the same target names no matter how protobuf is found. Suggested-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* FindProtobuf: add targetsAndré Apitzsch2017-05-181-0/+81
|
* FindProtobuf: Add option to find static libraries on UNIXSébastien GALLOU2017-02-061-0/+27
| | | | | | Add a `Protobuf_USE_STATIC_LIBS` input variable to optionally restrict searches to static library names. This follows the approach of `FindBoost`.
* FindProtobuf: Search for debug library named with `d` suffixAdam Martin2016-10-101-1/+1
| | | | | | | | 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
* FindProtobuf: Fix protobuf_generate_*() to handle subdirsMartin Joly2016-10-071-6/+10
| | | | | | | | | | The change in commit v3.7.0-rc1~513^2 (FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs, 2016-06-09) incorrectly adds subdirectories to the path of the generated files when `*.proto` files are passed to `protobuf_generate_*` with subdirectories. This behavior is not correct when `PROTOBUF_GENERATE_CPP_APPEND_PATH` is True (default behavior) as `protoc` will generate output file in the current build directory.
* Simplify CMake per-source license noticesBrad King2016-09-271-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS'Brad King2016-08-031-0/+8
|\ | | | | | | | | 5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
| * FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
| | | | | | | | | | | | Support was accidentally dropped by commit v3.6.0-rc1~273^2 (FindProtobuf: Rename variables to match case of module name, 2016-03-01).
* | FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.Vladimír Vondruš2016-06-091-0/+8
|/
* FindProtobuf: Rename variables to match case of module nameAntonio Perez Barrero2016-03-071-66/+112
| | | | | | | | | | | Use recommended case for variable names. i.e. matching name of the module as passed to `find_package`. For backwards compatibility, the upper case versions of both input and output variables are used and defined when appropriate. Skip this for the _FOUND variable because FPHSA already does it. Skip this for the _VERSION variable because that was recently added and never available with the old name in a release of CMake.
* FindProtobuf: check versionAntonio Perez Barrero2016-02-161-2/+57
| | | | | | | Check found libraries version to match user required version. Protobuf compiler executable version is checked to be aligned with found libraries, raising a warning message otherwise.
* FindProtobuf: prevent redundant PROTOBUF_LIBRARIESAntonio Perez Barrero2016-02-111-22/+23
| | | | | | Before this change, the variable PROTOBUF_LIBRARIES might get redundant value for debug and optimized configurations, e.g. `optimized;/usr/lib/libprotobuf.so;debug;/usr/lib/libprotobuf.so`.
* FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUNDSebastian Schuberth2015-12-111-1/+1
| | | | | | | All other modules use their module name (e.g. XxX for FindXxX.cmake) in find_package_handle_standard_args. Protobuf used all-caps, which triggers a bug when we try to find Protobuf with the CMakeFindDependencyMacro.cmake macro, which only checks for the mixed-case _FOUND.
* FindProtobuf: Add protobuf_generate_python functionAndreas Bergmeier2015-09-151-4/+63
|
* FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)A. Joël Lamotte2015-08-111-6/+11
| | | | | | 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.
* FindProtobuf: Cleanup reStructuredText documentation formattingBrad King2014-11-061-111/+64
| | | | Fix the markup to make the documentation format properly.
* FindProtobuf: Make outputs depend on protoc executableMichael Hanselmann2014-09-181-1/+1
| | | | | | | | | | | After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the generated source failed: "This file was generated by an older version of protoc which is incompatible with your Protocol Buffer headers. Please regenerate this file with a newer version of protoc.". Turns out the source and headers generated by way of FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a dependency on the compiler executable fixes this issue.
* Convert builtin help to reStructuredText source filesKitware Robot2013-10-151-37/+102
| | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* FindProtobuf: also find pthreadMatthew Woehlke2013-05-241-0/+13
| | | | | | Modify FindProtobuf.cmake to find the pthread library on UNIX platforms, and to add the same to PROTOBUF_LIBRARIES, as this is a link dependency of libraries using the protobuf headers.
* Remove CMake-language block-end command argumentsKitware Robot2012-08-131-1/+1
| | | | | | | | | | | | | | | | | Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. Run the following shell code: for c in else endif endforeach endfunction endmacro endwhile; do echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | egrep -z -v 'Tests/CMakeTests/While-Endwhile-' | xargs -0 sed -i -f convert.sed && rm convert.sed
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-131-1/+1
| | | | | | | | | | | | | | | | | Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
* FindProtobuf: Update documentation comment for 2.8.8Philip Lowman2012-01-031-1/+1
|
* FindProtobuf: Merge patch that allows extra import dirsPhilip Lowman2011-12-181-0/+13
| | | | | | | | Added support for additional import paths during protoc invocation time to the PROTOBUF_GENERATE_CPP public macro via a new PROTOBUF_IMPORT_DIRS optional variable. Patch courtesy of Miroslav Kes <mkes@ra.rockwell.com>
* FindProtoBuf: Documented limitation of the public macroPhilip Lowman2011-10-121-1/+5
|
* 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dirPhilip Lowman2011-06-141-2/+22
|
* Fix , to - in Copyright message so it passes CMake.ModuleNotices testPhilip Lowman2011-05-261-1/+1
|
* FindProtobuf: Better MSVC support, Searching for protobuf litePhilip Lowman2011-05-251-22/+82
| | | | | | Add support for finding debug libraries Add support for searching Google provided MSVC project dir structure for libs Add support for finding Protobuf "Lite" libraries
* Modules: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindPackageHandleStandardArgs module was originally created outside of CMake. It was added for CMake 2.6.0 by commit e118a627 (add a macro FIND_PACKAGE_HANDLE_STANDARD_ARGS..., 2007-07-18). However, it also proliferated into a number of other projects that at the time required only CMake 2.4 and thus could not depend on CMake to provide the module. CMake's own find modules started using the module in commit b5f656e0 (use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX modules..., 2007-07-18). Then commit d358cf5c (add 2nd, more powerful mode to find_package_handle_standard_args, 2010-07-29) added a new feature to the interface of the module that was fully optional and backward compatible with all existing users of the module. Later commit 5f183caa (FindZLIB: use the FPHSA version mode, 2010-08-04) and others shortly thereafter started using the new interface in CMake's own find modules. This change was also backward compatible because it was only an implementation detail within each module. Unforutnately these changes introduced a problem for projects that still have an old copy of FindPackageHandleStandardArgs in CMAKE_MODULE_PATH. When any such project uses one of CMake's builtin find modules the line include(FindPackageHandleStandardArgs) loads the copy from the project which does not have the new interface! Then the including find module tries to use the new interface with the old module and fails. Whether this breakage can be considered a backward incompatible change in CMake is debatable. The situation is analagous to copying a standard library header from one version of a compiler into a project and then observing problems when the next version of the compiler reports errors in its other headers that depend on its new version of the original header. Nevertheless it is a change to CMake that causes problems for projects that worked with previous versions. This problem was discovered during the 2.8.3 release candidate cycle. It is an instance of a more general problem with projects that provide their own versions of CMake modules when other CMake modules depend on them. At the time we resolved this instance of the problem with commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28) for the 2.8.3 release. In order to address the more general problem we introduced policy CMP0017 in commit db44848f (Prefer files from CMAKE_ROOT when including from CMAKE_ROOT, 2010-11-17). That change was followed by commit ce28737c (Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017, 2010-12-20) which reverted the original workaround in favor of using the policy. However, existing project releases do not set the policy behavior to NEW and therefore still exhibit the problem. We introduced in commit a364daf1 (Allow users to specify defaults for unset policies, 2011-01-03) an option for users to build existing projects by adding -DCMAKE_POLICY_DEFAULT_CMP0017=NEW to the command line. Unfortunately this solution still does not allow such projects to build out of the box, and there is no good way to suggest the use of the new option. The only remaining solution to keep existing projects that exhibit this problem building is to restore the change originally made in commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28). This also avoids policy CMP0017 warnings for this particular instance of the problem the policy addresses.
* Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017Alex Neundorf2011-01-041-1/+1
| | | | | | | | This puts the new search behaviour for included files in action, i.e. now when a file from Modules/ include()s another file, it also gets the one from Modules/ included, i.e. the one it expects. Alex
* Use absolute path to FindPackageHandleStandardArgs.cmake everywhereAlex Neundorf2010-09-281-1/+1
| | | | | | | This is to avoid getting an (older) copy of FPHSA.cmake which is e.g. installed with KDE 4.5.0 and 4.5.1. Alex
* Modules: Fix spelling 'To distributed' -> 'To distribute'Todd Gamblin2010-08-091-1/+1
|
* Fix module docs to be manpage (groff) friendlyBrad King2009-10-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | Most problems are fixed (or rather worked-around) by making long '=====' separators pre-formatted (i.e. prefixed with two spaces). In order to preserve visual view, the code examples themselves are prefixed with 3 spaces. This commit fixes the following man warnings: $ cmake --help-man - | LANG=C MANWIDTH=80 man --warnings -l - > /dev/null <standard input>:6024: warning [p 105, 1.7i]: can't break line <standard input>:6027: warning [p 105, 2.7i]: cannot adjust line <standard input>:6027: warning [p 105, 2.8i]: can't break line <standard input>:7142: warning [p 117, 7.8i]: can't break line <standard input>:7171: warning [p 117, 11.8i]: can't break line <standard input>:8878: warning [p 136, 9.0i]: can't break line <standard input>:8887: warning [p 136, 11.5i]: cannot adjust line <standard input>:8887: warning [p 136, 11.7i]: can't break line <standard input>:8904: warning [p 136, 14.2i]: can't break line Patch from Modestas Vainius. See issue #9659.
View Lorry Controller Status