|
|
|
|
if (protobuf_JSONCPP_PROVIDER STREQUAL "module")
|
|
|
|
|
if (NOT EXISTS "${protobuf_SOURCE_DIR}/third_party/jsoncpp/CMakeLists.txt")
|
|
|
|
|
message(FATAL_ERROR
|
|
|
|
|
"Cannot find third_party/jsoncpp directory that's needed to "
|
|
|
|
|
"build conformance tests. If you use git, make sure you have cloned "
|
|
|
|
|
"submodules:\n"
|
|
|
|
|
" git submodule update --init --recursive\n"
|
|
|
|
|
"If instead you want to skip them, run cmake with:\n"
|
|
|
|
|
" cmake -Dprotobuf_BUILD_CONFORMANCE=OFF\n")
|
|
|
|
|
endif()
|
|
|
|
|
elseif(protobuf_JSONCPP_PROVIDER STREQUAL "package")
|
|
|
|
|
find_package(jsoncpp REQUIRED)
|
|
|
|
|
endif()
|
|
|
|
|
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
file(MAKE_DIRECTORY ${protobuf_BINARY_DIR}/conformance)
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
${protobuf_BINARY_DIR}/conformance/conformance.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
|
|
|
|
|
DEPENDS ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
|
|
|
|
|
COMMAND ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
|
|
|
|
|
--proto_path=${protobuf_SOURCE_DIR}
|
|
|
|
|
--cpp_out=${protobuf_BINARY_DIR}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.cc
|
|
|
|
|
DEPENDS ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/editions/golden/test_messages_proto3_editions.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/editions/golden/test_messages_proto2_editions.proto
|
|
|
|
|
COMMAND ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/editions/golden/test_messages_proto3_editions.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/editions/golden/test_messages_proto2_editions.proto
|
|
|
|
|
--proto_path=${protobuf_SOURCE_DIR}
|
|
|
|
|
--proto_path=${protobuf_SOURCE_DIR}/src
|
|
|
|
|
--cpp_out=${protobuf_BINARY_DIR}
|
|
|
|
|
)
|
|
|
|
|
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
file(MAKE_DIRECTORY ${protobuf_BINARY_DIR}/src)
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
|
|
|
|
|
DEPENDS ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
|
|
|
|
|
COMMAND ${protobuf_PROTOC_EXE}
|
|
|
|
|
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
|
|
|
|
|
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
|
|
|
|
|
--proto_path=${protobuf_SOURCE_DIR}/src
|
|
|
|
|
--cpp_out=${protobuf_BINARY_DIR}/src
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_library(libconformance_common STATIC
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
${protobuf_BINARY_DIR}/conformance/conformance.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.cc
|
Write generated source files to the build tree, not the source tree. (#14455)
My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others):
```
[ 30%] Built target statusor
[ 34%] Built target libprotobuf-lite
[ 45%] Built target libprotobuf
Consolidate compiler generated dependencies of target libprotoc
[ 62%] Built target libprotoc
Consolidate compiler generated dependencies of target protoc
[ 62%] Built target protoc
Consolidate compiler generated dependencies of target scoped_mock_log
[ 62%] Built target scoped_mock_log
[ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc
/home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system
make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1
make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2
make: *** [Makefile:146: all] Error 2
```
(`/home/src` is a read-only mount)
Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources.
(Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.)
Closes #14455
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587
PiperOrigin-RevId: 607031010
10 months ago
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.h
|
|
|
|
|
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
|
|
|
|
|
)
|
|
|
|
|
target_link_libraries(libconformance_common
|
|
|
|
|
${protobuf_LIB_PROTOBUF}
|
|
|
|
|
${protobuf_ABSL_USED_TARGETS}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_executable(conformance_test_runner
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.cc
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.h
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance_test.cc
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance_test_runner.cc
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance_test_main.cc
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.cc
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.h
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_executable(conformance_cpp
|
|
|
|
|
${protobuf_SOURCE_DIR}/conformance/conformance_cpp.cc
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
target_include_directories(
|
|
|
|
|
conformance_test_runner
|
|
|
|
|
PUBLIC ${protobuf_SOURCE_DIR} ${protobuf_SOURCE_DIR}/conformance)
|
|
|
|
|
|
|
|
|
|
target_include_directories(
|
|
|
|
|
conformance_cpp
|
|
|
|
|
PUBLIC ${protobuf_SOURCE_DIR})
|
|
|
|
|
|
|
|
|
|
target_include_directories(conformance_test_runner PRIVATE ${ABSL_ROOT_DIR})
|
|
|
|
|
target_include_directories(conformance_cpp PRIVATE ${ABSL_ROOT_DIR})
|
|
|
|
|
|
|
|
|
|
target_link_libraries(conformance_test_runner
|
|
|
|
|
libconformance_common
|
|
|
|
|
${protobuf_LIB_PROTOBUF}
|
|
|
|
|
${protobuf_ABSL_USED_TARGETS}
|
|
|
|
|
)
|
|
|
|
|
target_link_libraries(conformance_cpp
|
|
|
|
|
libconformance_common
|
|
|
|
|
${protobuf_LIB_PROTOBUF}
|
|
|
|
|
${protobuf_ABSL_USED_TARGETS}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_test(NAME conformance_cpp_test
|
|
|
|
|
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/conformance_test_runner
|
|
|
|
|
--failure_list ${protobuf_SOURCE_DIR}/conformance/failure_list_cpp.txt
|
|
|
|
|
--text_format_failure_list ${protobuf_SOURCE_DIR}/conformance/text_format_failure_list_cpp.txt
|
|
|
|
|
--output_dir ${protobuf_TEST_XML_OUTDIR}
|
|
|
|
|
--maximum_edition 2023
|
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/conformance_cpp
|
|
|
|
|
DEPENDS conformance_test_runner conformance_cpp)
|
|
|
|
|
|
|
|
|
|
set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Disable tests")
|
|
|
|
|
if(protobuf_JSONCPP_PROVIDER STREQUAL "module")
|
|
|
|
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp third_party/jsoncpp)
|
|
|
|
|
target_include_directories(conformance_test_runner PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp/include)
|
|
|
|
|
if(BUILD_SHARED_LIBS)
|
|
|
|
|
target_link_libraries(conformance_test_runner jsoncpp_lib)
|
|
|
|
|
else()
|
|
|
|
|
target_link_libraries(conformance_test_runner jsoncpp_static)
|
|
|
|
|
endif()
|
|
|
|
|
else()
|
|
|
|
|
target_link_libraries(conformance_test_runner jsoncpp)
|
|
|
|
|
endif()
|
