mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Update cmake so that rippled can build as a submodule
This commit is contained in:
committed by
Nik Bougalis
parent
4702c8b591
commit
54ece72b62
@@ -35,10 +35,10 @@ function (print_ep_logs _target)
|
|||||||
COMMENT "${_target} BUILD OUTPUT"
|
COMMENT "${_target} BUILD OUTPUT"
|
||||||
COMMAND ${CMAKE_COMMAND}
|
COMMAND ${CMAKE_COMMAND}
|
||||||
-DIN_FILE=${STAMP_DIR}/${_target}-build-out.log
|
-DIN_FILE=${STAMP_DIR}/${_target}-build-out.log
|
||||||
-P ${CMAKE_SOURCE_DIR}/Builds/CMake/echo_file.cmake
|
-P ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/echo_file.cmake
|
||||||
COMMAND ${CMAKE_COMMAND}
|
COMMAND ${CMAKE_COMMAND}
|
||||||
-DIN_FILE=${STAMP_DIR}/${_target}-build-err.log
|
-DIN_FILE=${STAMP_DIR}/${_target}-build-err.log
|
||||||
-P ${CMAKE_SOURCE_DIR}/Builds/CMake/echo_file.cmake)
|
-P ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/echo_file.cmake)
|
||||||
endfunction ()
|
endfunction ()
|
||||||
|
|
||||||
#[=========================================================[
|
#[=========================================================[
|
||||||
@@ -177,7 +177,7 @@ function (git_hash hash_val)
|
|||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
execute_process (COMMAND ${GIT_EXECUTABLE} "log" "--pretty=${_format}" "-n1"
|
execute_process (COMMAND ${GIT_EXECUTABLE} "log" "--pretty=${_format}" "-n1"
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
RESULT_VARIABLE _git_exit_code
|
RESULT_VARIABLE _git_exit_code
|
||||||
OUTPUT_VARIABLE _temp_hash
|
OUTPUT_VARIABLE _temp_hash
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
@@ -194,7 +194,7 @@ function (git_branch branch_val)
|
|||||||
endif ()
|
endif ()
|
||||||
set (_branch "")
|
set (_branch "")
|
||||||
execute_process (COMMAND ${GIT_EXECUTABLE} "rev-parse" "--abbrev-ref" "HEAD"
|
execute_process (COMMAND ${GIT_EXECUTABLE} "rev-parse" "--abbrev-ref" "HEAD"
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
RESULT_VARIABLE _git_exit_code
|
RESULT_VARIABLE _git_exit_code
|
||||||
OUTPUT_VARIABLE _temp_branch
|
OUTPUT_VARIABLE _temp_branch
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ if (coverage)
|
|||||||
|
|
||||||
set (extract_pattern "")
|
set (extract_pattern "")
|
||||||
if (coverage_core_only)
|
if (coverage_core_only)
|
||||||
set (extract_pattern "${CMAKE_SOURCE_DIR}/src/ripple/")
|
set (extract_pattern "${CMAKE_CURRENT_SOURCE_DIR}/src/ripple/")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (LLVM_COV AND LLVM_PROFDATA)
|
if (LLVM_COV AND LLVM_PROFDATA)
|
||||||
@@ -72,14 +72,14 @@ if (coverage)
|
|||||||
COMMAND ${CMAKE_COMMAND} -E echo "Generating coverage- results will be in ${CMAKE_BINARY_DIR}/coverage/index.html."
|
COMMAND ${CMAKE_COMMAND} -E echo "Generating coverage- results will be in ${CMAKE_BINARY_DIR}/coverage/index.html."
|
||||||
# create baseline info file
|
# create baseline info file
|
||||||
COMMAND ${LCOV}
|
COMMAND ${LCOV}
|
||||||
--no-external -d "${CMAKE_SOURCE_DIR}" -c -d . -i -o baseline.info
|
--no-external -d "${CMAKE_CURRENT_SOURCE_DIR}" -c -d . -i -o baseline.info
|
||||||
| grep -v "ignoring data for external file"
|
| grep -v "ignoring data for external file"
|
||||||
# run tests
|
# run tests
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Running rippled tests for coverage report."
|
COMMAND ${CMAKE_COMMAND} -E echo "Running rippled tests for coverage report."
|
||||||
COMMAND rippled --unittest$<$<BOOL:${coverage_test}>:=${coverage_test}> --quiet --unittest-log
|
COMMAND rippled --unittest$<$<BOOL:${coverage_test}>:=${coverage_test}> --quiet --unittest-log
|
||||||
# Create test coverage data file
|
# Create test coverage data file
|
||||||
COMMAND ${LCOV}
|
COMMAND ${LCOV}
|
||||||
--no-external -d "${CMAKE_SOURCE_DIR}" -c -d . -o tests.info
|
--no-external -d "${CMAKE_CURRENT_SOURCE_DIR}" -c -d . -o tests.info
|
||||||
| grep -v "ignoring data for external file"
|
| grep -v "ignoring data for external file"
|
||||||
# Combine baseline and test coverage data
|
# Combine baseline and test coverage data
|
||||||
COMMAND ${LCOV}
|
COMMAND ${LCOV}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ if (NOT TARGET Doxygen::doxygen)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
set (doxygen_output_directory "${CMAKE_BINARY_DIR}/docs")
|
set (doxygen_output_directory "${CMAKE_BINARY_DIR}/docs")
|
||||||
set (doxygen_include_path "${CMAKE_SOURCE_DIR}/src")
|
set (doxygen_include_path "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
||||||
set (doxygen_index_file "${doxygen_output_directory}/html/index.html")
|
set (doxygen_index_file "${doxygen_output_directory}/html/index.html")
|
||||||
set (doxyfile "${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile")
|
set (doxyfile "${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile")
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ if (NOT DEFINED NIH_CACHE_ROOT)
|
|||||||
if (DEFINED ENV{NIH_CACHE_ROOT})
|
if (DEFINED ENV{NIH_CACHE_ROOT})
|
||||||
set (NIH_CACHE_ROOT $ENV{NIH_CACHE_ROOT})
|
set (NIH_CACHE_ROOT $ENV{NIH_CACHE_ROOT})
|
||||||
else ()
|
else ()
|
||||||
set (NIH_CACHE_ROOT "${CMAKE_SOURCE_DIR}/.nih_c")
|
set (NIH_CACHE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/.nih_c")
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
set (nih_cache_path
|
set (nih_cache_path
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ if (is_root_project)
|
|||||||
docker run
|
docker run
|
||||||
-e NIH_CACHE_ROOT=/opt/rippled_bld/pkg/.nih_c
|
-e NIH_CACHE_ROOT=/opt/rippled_bld/pkg/.nih_c
|
||||||
-v ${NIH_CACHE_ROOT}/pkgbuild:/opt/rippled_bld/pkg/.nih_c
|
-v ${NIH_CACHE_ROOT}/pkgbuild:/opt/rippled_bld/pkg/.nih_c
|
||||||
-v ${CMAKE_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
|
-v ${CMAKE_CURRENT_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
|
||||||
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
||||||
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
||||||
-t rippled-rpm-builder:${container_label}
|
-t rippled-rpm-builder:${container_label}
|
||||||
@@ -124,7 +124,7 @@ if (is_root_project)
|
|||||||
docker run
|
docker run
|
||||||
-e NIH_CACHE_ROOT=/opt/rippled_bld/pkg/.nih_c
|
-e NIH_CACHE_ROOT=/opt/rippled_bld/pkg/.nih_c
|
||||||
-v ${NIH_CACHE_ROOT}/pkgbuild:/opt/rippled_bld/pkg/.nih_c
|
-v ${NIH_CACHE_ROOT}/pkgbuild:/opt/rippled_bld/pkg/.nih_c
|
||||||
-v ${CMAKE_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
|
-v ${CMAKE_CURRENT_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
|
||||||
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
||||||
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
||||||
-t rippled-dpkg-builder:${container_label}
|
-t rippled-dpkg-builder:${container_label}
|
||||||
|
|||||||
@@ -64,13 +64,13 @@ if (local_rocksdb)
|
|||||||
PATCH_COMMAND
|
PATCH_COMMAND
|
||||||
# only used by windows build
|
# only used by windows build
|
||||||
${CMAKE_COMMAND} -E copy
|
${CMAKE_COMMAND} -E copy
|
||||||
${CMAKE_SOURCE_DIR}/Builds/CMake/rocks_thirdparty.inc
|
${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/rocks_thirdparty.inc
|
||||||
<SOURCE_DIR>/thirdparty.inc
|
<SOURCE_DIR>/thirdparty.inc
|
||||||
COMMAND
|
COMMAND
|
||||||
# fixup their build version file to keep the values
|
# fixup their build version file to keep the values
|
||||||
# from changing always
|
# from changing always
|
||||||
${CMAKE_COMMAND} -E copy_if_different
|
${CMAKE_COMMAND} -E copy_if_different
|
||||||
${CMAKE_SOURCE_DIR}/Builds/CMake/rocksdb_build_version.cc.in
|
${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/rocksdb_build_version.cc.in
|
||||||
<SOURCE_DIR>/util/build_version.cc.in
|
<SOURCE_DIR>/util/build_version.cc.in
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ else()
|
|||||||
# This patch process is likely fragile and should be reviewed carefully
|
# This patch process is likely fragile and should be reviewed carefully
|
||||||
# whenever we update the GIT_TAG above.
|
# whenever we update the GIT_TAG above.
|
||||||
PATCH_COMMAND
|
PATCH_COMMAND
|
||||||
${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/Builds/CMake/soci_patch.cmake
|
${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/soci_patch.cmake
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||||||
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ else()
|
|||||||
# for the single amalgamation source file.
|
# for the single amalgamation source file.
|
||||||
PATCH_COMMAND
|
PATCH_COMMAND
|
||||||
${CMAKE_COMMAND} -E copy_if_different
|
${CMAKE_COMMAND} -E copy_if_different
|
||||||
${CMAKE_SOURCE_DIR}/Builds/CMake/CMake_sqlite3.txt
|
${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/CMake_sqlite3.txt
|
||||||
<SOURCE_DIR>/CMakeLists.txt
|
<SOURCE_DIR>/CMakeLists.txt
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||||||
|
|||||||
@@ -312,7 +312,7 @@ set (GRPC_GEN_DIR "${CMAKE_BINARY_DIR}/proto_gen_grpc")
|
|||||||
file (MAKE_DIRECTORY ${GRPC_GEN_DIR})
|
file (MAKE_DIRECTORY ${GRPC_GEN_DIR})
|
||||||
set (GRPC_PROTO_SRCS)
|
set (GRPC_PROTO_SRCS)
|
||||||
set (GRPC_PROTO_HDRS)
|
set (GRPC_PROTO_HDRS)
|
||||||
set (GRPC_PROTO_ROOT "${CMAKE_SOURCE_DIR}/src/ripple/proto/org")
|
set (GRPC_PROTO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/src/ripple/proto/org")
|
||||||
file(GLOB_RECURSE GRPC_DEFINITION_FILES LIST_DIRECTORIES false "${GRPC_PROTO_ROOT}/*.proto")
|
file(GLOB_RECURSE GRPC_DEFINITION_FILES LIST_DIRECTORIES false "${GRPC_PROTO_ROOT}/*.proto")
|
||||||
foreach(file ${GRPC_DEFINITION_FILES})
|
foreach(file ${GRPC_DEFINITION_FILES})
|
||||||
get_filename_component(_abs_file ${file} ABSOLUTE)
|
get_filename_component(_abs_file ${file} ABSOLUTE)
|
||||||
|
|||||||
Reference in New Issue
Block a user