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
604b671d12
sandboxed-api/cmake
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
..
abseil Replace sapi::Status with absl::Status 2020-02-27 09:24:12 -08:00
benchmark Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
gflags Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
glog Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
googletest Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
libcap Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
libunwind Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
protobuf Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
FindLibcap.cmake Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
FindLibffi.cmake Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
libcap_capability.h.in Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
SapiBuildDefs.cmake Cache the location of Python 3 interpreter 2020-03-17 21:26:14 +01:00
SapiDeps.cmake Cache the location of Python 3 interpreter 2020-03-17 21:26:14 +01:00
SapiOptions.cmake Update license header with recommended best practices 2020-01-17 05:05:29 -08:00
SapiUtil.cmake Fix path to generated proto sources when embedding 2020-03-18 18:47:02 +01:00