Skip to content

CMake: use add_compile_options instead of add_definitions for compile options#10293

Merged
acozzette merged 1 commit intoprotocolbuffers:mainfrom
Neumann-A:use_compile_options
Jul 26, 2022
Merged

CMake: use add_compile_options instead of add_definitions for compile options#10293
acozzette merged 1 commit intoprotocolbuffers:mainfrom
Neumann-A:use_compile_options

Conversation

@Neumann-A
Copy link
Contributor

fixes:

  • using CMake hacks like unnecessary setting CMAKE_RC_COMPILE_OBJECT

@google-cla
Copy link

google-cla bot commented Jul 21, 2022

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@acozzette acozzette merged commit 30f273c into protocolbuffers:main Jul 26, 2022
@acozzette
Copy link

@Neumann-A Thanks!

@Neumann-A Neumann-A deleted the use_compile_options branch July 26, 2022 18:03
zwassall-gentuity added a commit to zwassall-gentuity/onnxruntime that referenced this pull request Feb 28, 2025
This introduces some extra changes to the non-vcpkg configuration that
were in cmake/vcpkg-ports/protobuf/protobuf_cmake.patch but not
cmake/patches/protobuf/protobuf_cmake.patch. I believe that the changes
are all welcome; in particular, the new changes to CMakeLists.txt in the
patch file (from protocolbuffers/protobuf#10293)
fix resource compiler invocations in some situations, as was the case
for me using clang-cl on Windows.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants