ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: kindly ask python not to polute src/

Browse Source 
Type: make
Change-Id: I1ec82e0f3c19dee79f942996339240c73d4e380c
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2021-05-25 19:28:21 +02:00
committed by Florin Coras
parent 9303b10897
commit 7cf80af582
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -73,6 +73,7 @@ set(VPP_LIBRARY_DIR "lib" CACHE STRING "Relative library directory path")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_RUNTIME_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_RUNTIME_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR})
set(VPP_BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles) set(VPP_BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles)
set(PYENV PYTHONPYCACHEPREFIX=${CMAKE_BINARY_DIR}/CMakeFile/__pycache__)
if (CMAKE_BUILD_TYPE) if (CMAKE_BUILD_TYPE)
add_compile_options(-g -fPIC -Werror -Wall) add_compile_options(-g -fPIC -Werror -Wall)

8
src/cmake/api.cmake
View File

@ -38,7 +38,7 @@ function(vpp_generate_api_c_header file)
add_custom_command ( add_custom_command (
OUTPUT ${OUTPUT_HEADERS} OUTPUT ${OUTPUT_HEADERS}
COMMAND mkdir -p ${output_dir} COMMAND mkdir -p ${output_dir}
COMMAND ${VPP_APIGEN} COMMAND ${PYENV} ${VPP_APIGEN}
ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --outputdir ${output_dir} --output ${output_name} ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --outputdir ${output_dir} --output ${output_name}
DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file} DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}" COMMENT "Generating API header ${output_name}"
@ -63,7 +63,7 @@ function(vpp_generate_api_json_header file dir component)
endif() endif()
add_custom_command (OUTPUT ${output_name} add_custom_command (OUTPUT ${output_name}
COMMAND mkdir -p ${output_dir} COMMAND mkdir -p ${output_dir}
COMMAND ${VPP_APIGEN} COMMAND ${PYENV} ${VPP_APIGEN}
ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name} ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file} DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}" COMMENT "Generating API header ${output_name}"
@ -94,7 +94,7 @@ function(vpp_generate_vapi_c_header f)
add_custom_command( add_custom_command(
OUTPUT ${output_name} OUTPUT ${output_name}
WORKING_DIRECTORY ${VPP_BINARY_DIR}/vpp-api/vapi WORKING_DIRECTORY ${VPP_BINARY_DIR}/vpp-api/vapi
COMMAND ${VPP_VAPI_C_GEN} COMMAND ${PYENV} ${VPP_VAPI_C_GEN}
ARGS --remove-path ${input} ARGS --remove-path ${input}
DEPENDS ${input} ${VPP_VAPI_C_GEN_DEPENDS} DEPENDS ${input} ${VPP_VAPI_C_GEN_DEPENDS}
COMMENT "Generating VAPI C header ${output_name}" COMMENT "Generating VAPI C header ${output_name}"
@ -121,7 +121,7 @@ function (vpp_generate_vapi_cpp_header f)
add_custom_command( add_custom_command(
OUTPUT ${output_name} OUTPUT ${output_name}
WORKING_DIRECTORY ${VPP_BINARY_DIR}/vpp-api/vapi WORKING_DIRECTORY ${VPP_BINARY_DIR}/vpp-api/vapi
COMMAND ${VPP_VAPI_CPP_GEN} COMMAND ${PYENV} ${VPP_VAPI_CPP_GEN}
ARGS --gen-h-prefix=vapi --remove-path ${input} ARGS --gen-h-prefix=vapi --remove-path ${input}
DEPENDS ${input} ${VPP_VAPI_CPP_GEN_DEPENDS} DEPENDS ${input} ${VPP_VAPI_CPP_GEN_DEPENDS}
COMMENT "Generating VAPI C++ header ${output_name}" COMMENT "Generating VAPI C++ header ${output_name}"

4
src/vpp-api/vapi/CMakeLists.txt
View File

@ -69,7 +69,7 @@ if(SUBUNIT_INCLUDE_DIR AND SUBUNIT_LIB)
add_custom_command( add_custom_command(
OUTPUT fake.api.vapi.h OUTPUT fake.api.vapi.h
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_c_gen.py COMMAND ${PYENV} ${CMAKE_CURRENT_SOURCE_DIR}/vapi_c_gen.py
ARGS --remove-path ${CMAKE_CURRENT_SOURCE_DIR}/fake.api.json ARGS --remove-path ${CMAKE_CURRENT_SOURCE_DIR}/fake.api.json
DEPENDS fake.api.json DEPENDS fake.api.json
COMMENT "Generating fake VAPI C header ${output_name}" COMMENT "Generating fake VAPI C header ${output_name}"
@ -78,7 +78,7 @@ if(SUBUNIT_INCLUDE_DIR AND SUBUNIT_LIB)
add_custom_command( add_custom_command(
OUTPUT fake.api.vapi.hpp OUTPUT fake.api.vapi.hpp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_cpp_gen.py COMMAND ${PYENV} ${CMAKE_CURRENT_SOURCE_DIR}/vapi_cpp_gen.py
ARGS --remove-path ${CMAKE_CURRENT_SOURCE_DIR}/fake.api.json ARGS --remove-path ${CMAKE_CURRENT_SOURCE_DIR}/fake.api.json
DEPENDS fake.api.json DEPENDS fake.api.json
COMMENT "Generating fake VAPI C++ header ${output_name}" COMMENT "Generating fake VAPI C++ header ${output_name}"