StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity
f44cca6c98
sandboxed-api/sandboxed_api
History
Christian Blichmann f44cca6c98 Fix path to generated proto sources when embedding 
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>
2020-03-18 18:47:02 +01:00
..
bazel Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
docs Revert accidental deletion of the sandbox image 2019-09-04 06:33:29 -07:00
examples Fix path to generated proto sources when embedding 2020-03-18 18:47:02 +01:00
sandbox2 Fix path to generated proto sources when embedding 2020-03-18 18:47:02 +01:00
tools/generator2 Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
util Fix path to generated proto sources when embedding 2020-03-18 18:47:02 +01:00
.bazelrc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
BUILD.bazel Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
call.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
client.cc Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
CMakeLists.txt Fix path to generated proto sources when embedding 2020-03-18 18:47:02 +01:00
embed_file.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
embed_file.h Replace deprecated thread annotations macros. 2020-01-30 05:06:55 -08:00
file_toc.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
lenval_core.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
proto_arg.proto Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
proto_helper.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
rpcchannel.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
rpcchannel.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
sandbox.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
sandbox.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
sapi_test.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
transaction.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
transaction.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_abstract.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_abstract.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_array.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_int.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_int.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_lenval.cc Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_lenval.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_pointable.cc Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_pointable.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_proto.h Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
var_ptr.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_reg.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_struct.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_type.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
var_void.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
vars.h Update license header with recommended best practices 2020-01-17 05:05:29 -08:00