mirror of
https://github.com/google/sandboxed-api.git
synced 2024-03-22 13:11:30 +08:00
f44cca6c98
When embedding SAPI in an external CMake project, the version of
`protobuf_generate_cpp` that we lifted from upstream protobuf produces
the wrong generated file paths.
For example, given this project structure:
```
/parent/
+-- myproject/
+-- myproject_build/ <- CMake build directory
+-- sandboxed-api/ <- Checkout from GitHub
```
And a CMake file in `myproject/CMakeLists.txt` that embeds SAPI like
this:
```
cmake_minimum_required(VERSION 3.12)
project(SandboxedTest LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(
${PROJECT_SOURCE_DIR}/../sandboxed-api
${PROJECT_BINARY_DIR}/sandboxed-api
)
```
Then `protobuf_generate_cpp` correctly invokes the protoc compiler to
generate
`/parent/myproject_build/sandboxed-api/sandboxed_api/proto_arg.proto.pb.cc'.
However, the path of the generated source file that is passed to the C++
compiler will be
`/parent/myproject_build/sandboxed-api/sandboxed_api/../../myproject_build/sandboxed-api/sandboxed_api/proto_arg.pb.cc`.
Note the duplicated project build directory component in the
canonicalized version:
`/parent/myproject_build/myproject_build/sandboxed-api/sandboxed_api/proto_arg.pb.cc`.
This change simple omits the computation of any relative file paths and
simply uses `_pb_PROTOC_OUT_DIR` which defauls to
`CMAKE_CURRENT_BINARY_DIR`, which should always contain the correct
path.
Signed-off-by: Christian Blichmann <mail@blichmann.eu>
74 lines
1.9 KiB
CMake
74 lines
1.9 KiB
CMake
# Copyright 2019 Google LLC
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# sandboxed_api/examples/sum/lib:sum_params_proto
|
|
sapi_protobuf_generate_cpp(_sapi_sum_params_pb_cc _sapi_sum_params_pb_h
|
|
sum_params.proto
|
|
)
|
|
# Object library to avoid having to use -Wl,--whole-archive. This simulates
|
|
# Bazel's alwayslink=1.
|
|
add_library(sapi_sum_params_proto OBJECT
|
|
${_sapi_sum_params_pb_cc}
|
|
${_sapi_sum_params_pb_h}
|
|
)
|
|
add_library(sapi::sum_params_proto ALIAS sapi_sum_params_proto)
|
|
target_include_directories(sapi_sum_params_proto PUBLIC
|
|
${Protobuf_INCLUDE_DIRS}
|
|
)
|
|
|
|
# sandboxed_api/examples/sum/lib:sum
|
|
add_library(sapi_sum STATIC
|
|
sum.c
|
|
sum_cpp.cc
|
|
)
|
|
add_library(sapi::sum ALIAS sapi_sum)
|
|
add_dependencies(sapi_sum
|
|
sapi::sum_params_proto
|
|
)
|
|
target_link_libraries(sapi_sum
|
|
PRIVATE $<TARGET_OBJECTS:sapi_sum_params_proto>
|
|
glog::glog
|
|
sapi::base
|
|
PUBLIC protobuf::libprotobuf
|
|
)
|
|
|
|
# sandboxed_api/examples/sum/lib:sum-sapi
|
|
add_sapi_library(sum-sapi
|
|
SOURCES sandbox.h
|
|
FUNCTIONS sum
|
|
sums
|
|
addf
|
|
sub
|
|
mul
|
|
divs
|
|
muld
|
|
crash
|
|
violate
|
|
sumarr
|
|
testptr
|
|
read_int
|
|
sleep_for_sec
|
|
sumproto
|
|
INPUTS sum.c
|
|
sum_cpp.cc
|
|
LIBRARY sapi_sum
|
|
LIBRARY_NAME Sum
|
|
NAMESPACE ""
|
|
)
|
|
add_library(sapi::sum_sapi ALIAS sum-sapi)
|
|
target_link_libraries(sum-sapi PRIVATE
|
|
$<TARGET_OBJECTS:sapi_sum_params_proto>
|
|
sapi::base
|
|
)
|