diff options
| author | sennikovmv <sennikovmv@yandex-team.com> | 2024-02-16 10:14:01 +0300 |
|---|---|---|
| committer | Innokentii Mokin <innokentii@ydb.tech> | 2024-02-17 11:32:12 +0000 |
| commit | 09824efb0099bc4ca1905ed041fb4a9df330825c (patch) | |
| tree | 3ce1b0635fb5b3fb2c6db82928160ddc31f46db8 | |
| parent | 7def9975db05a4c70cbfb8c9713199fcbcc5aecb (diff) | |
| download | ydb-09824efb0099bc4ca1905ed041fb4a9df330825c.tar.gz | |
Yexport test
42477b361df98bfa4ad9fa98d79ee8c6e27a78ef
13 files changed, 70 insertions, 70 deletions
diff --git a/build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py b/build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py index 11c80fb0d2..5be06dc37b 100644 --- a/build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py +++ b/build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py @@ -46,7 +46,7 @@ class Opts(object): self.preserved_options = [] - # these variables can contain paths absolute or relative to CMAKE_BINARY_DIR + # these variables can contain paths absolute or relative to project_binary_dir self.global_libs_and_objects_input = [] self.non_global_libs_input = [] self.output = None @@ -57,7 +57,7 @@ class Opts(object): (these use absolute paths). If it is a library that is added from some other path (like CUDA) return True """ - return not (os.path.exists(path) or os.path.exists(os.path.join(self.parsed_args.cmake_binary_dir, path))) + return not (os.path.exists(path) or os.path.exists(os.path.join(self.parsed_args.project_binary_dir, path))) def process_input(args): i = 0 @@ -143,7 +143,7 @@ class FilesCombiner(object): archiver_tool_path, arch_type, 'gnu', # llvm_ar_format, used only if arch_type == 'LLVM_AR' - opts.parsed_args.cmake_binary_dir, + opts.parsed_args.project_binary_dir, 'None', # plugin. Unused for now ] # the remaining archiving cmd args are [output, .. input .. ] diff --git a/build/export_generators/hardcoded-cmake/cmake/archive.cmake b/build/export_generators/hardcoded-cmake/cmake/archive.cmake index f822498dae..0f4f0b4d35 100644 --- a/build/export_generators/hardcoded-cmake/cmake/archive.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/archive.cmake @@ -5,8 +5,8 @@ function(target_rodata_sources TgtName Scope) get_filename_component(CppVar ${rodata} NAME_WLE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CppVar}.cpp - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/rodata2cpp.py ${CppVar} ${rodata} ${CMAKE_CURRENT_BINARY_DIR}/${CppVar}.cpp - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/rodata2cpp.py ${rodata} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/rodata2cpp.py ${CppVar} ${rodata} ${CMAKE_CURRENT_BINARY_DIR}/${CppVar}.cpp + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/rodata2cpp.py ${rodata} ) target_sources(${TgtName} ${Scope} ${CMAKE_CURRENT_BINARY_DIR}/${CppVar}.cpp) endforeach() diff --git a/build/export_generators/hardcoded-cmake/cmake/bison.cmake b/build/export_generators/hardcoded-cmake/cmake/bison.cmake index 38d2b91ff9..fd7eddda7b 100644 --- a/build/export_generators/hardcoded-cmake/cmake/bison.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/bison.cmake @@ -1,7 +1,7 @@ function(target_bison_parser Tgt Scope) foreach(arg ${ARGN}) get_filename_component(argPath ${arg} REALPATH) - if (argPath MATCHES "${CMAKE_SOURCE_DIR}/.*") + if (argPath MATCHES "${PROJECT_SOURCE_DIR}/.*") file(RELATIVE_PATH argRel ${CMAKE_CURRENT_SOURCE_DIR} ${argPath}) string(REPLACE ".." "__" ArgInBindir ${argRel}) set(ArgInBindir ${CMAKE_CURRENT_BINARY_DIR}/${ArgInBindir}) @@ -13,7 +13,7 @@ function(target_bison_parser Tgt Scope) add_custom_command( OUTPUT ${OutputDir}/${OutputBase}.cpp ${OutputDir}/${OutputBase}.h COMMAND ${CMAKE_COMMAND} -E make_directory ${OutputDir} - COMMAND ${CMAKE_COMMAND} -E env M4=${CMAKE_BINARY_DIR}/bin/m4/bin/m4 ${CMAKE_BINARY_DIR}/bin/bison/bin/bison ${BISON_FLAGS} -v --defines=${OutputDir}/${OutputBase}.h -o ${OutputDir}/${OutputBase}.cpp ${arg} + COMMAND ${CMAKE_COMMAND} -E env M4=${PROJECT_BINARY_DIR}/bin/m4/bin/m4 ${PROJECT_BINARY_DIR}/bin/bison/bin/bison ${BISON_FLAGS} -v --defines=${OutputDir}/${OutputBase}.h -o ${OutputDir}/${OutputBase}.cpp ${arg} DEPENDS ${arg} ) target_sources(${Tgt} ${Scope} ${OutputDir}/${OutputBase}.cpp ${OutputDir}/${OutputBase}.h) diff --git a/build/export_generators/hardcoded-cmake/cmake/common.cmake b/build/export_generators/hardcoded-cmake/cmake/common.cmake index 2dfd77e9d4..6578d58ae7 100644 --- a/build/export_generators/hardcoded-cmake/cmake/common.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/common.cmake @@ -21,7 +21,7 @@ endfunction() function(target_ragel_lexers TgtName Key Src) - SET(RAGEL_BIN ${CMAKE_BINARY_DIR}/bin/ragel${CMAKE_EXECUTABLE_SUFFIX}) + SET(RAGEL_BIN ${PROJECT_BINARY_DIR}/bin/ragel${CMAKE_EXECUTABLE_SUFFIX}) get_filename_component(OutPath ${Src} NAME_WLE) get_filename_component(SrcDirPath ${Src} DIRECTORY) get_filename_component(OutputExt ${OutPath} EXT) @@ -30,34 +30,34 @@ function(target_ragel_lexers TgtName Key Src) endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/run_tool.py -- ${RAGEL_BIN} ${RAGEL_FLAGS} ${ARGN} -o ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} ${Src} - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/run_tool.py ${Src} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/run_tool.py -- ${RAGEL_BIN} ${RAGEL_FLAGS} ${ARGN} -o ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} ${Src} + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/run_tool.py ${Src} WORKING_DIRECTORY ${SrcDirPath} ) target_sources(${TgtName} ${Key} ${CMAKE_CURRENT_BINARY_DIR}/${OutPath}) endfunction() function(target_yasm_source TgtName Key Src) - SET(YASM_BIN ${CMAKE_BINARY_DIR}/bin/yasm${CMAKE_EXECUTABLE_SUFFIX}) + SET(YASM_BIN ${PROJECT_BINARY_DIR}/bin/yasm${CMAKE_EXECUTABLE_SUFFIX}) get_filename_component(OutPath ${Src} NAME_WLE) string(APPEND OutPath .o) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/run_tool.py -- ${YASM_BIN} ${YASM_FLAGS} ${ARGN} -o ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} ${Src} - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/run_tool.py ${Src} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/run_tool.py -- ${YASM_BIN} ${YASM_FLAGS} ${ARGN} -o ${CMAKE_CURRENT_BINARY_DIR}/${OutPath} ${Src} + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/run_tool.py ${Src} ) target_sources(${TgtName} ${Key} ${CMAKE_CURRENT_BINARY_DIR}/${OutPath}) endfunction() function(target_joined_source TgtName Out) foreach(InSrc ${ARGN}) - file(RELATIVE_PATH IncludePath ${CMAKE_SOURCE_DIR} ${InSrc}) + file(RELATIVE_PATH IncludePath ${PROJECT_SOURCE_DIR} ${InSrc}) list(APPEND IncludesList ${IncludePath}) endforeach() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${Out} - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${CMAKE_CURRENT_BINARY_DIR}/${Out} ${IncludesList} - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${ARGN} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${CMAKE_CURRENT_BINARY_DIR}/${Out} ${IncludesList} + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${ARGN} ) target_sources(${TgtName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${Out}) endfunction() @@ -74,11 +74,11 @@ function(target_sources_custom TgtName CompileOutSuffix) ) foreach(Src ${TARGET_SOURCES_CUSTOM_SRCS}) - file(RELATIVE_PATH SrcRealPath ${CMAKE_SOURCE_DIR} ${Src}) + file(RELATIVE_PATH SrcRealPath ${PROJECT_SOURCE_DIR} ${Src}) get_filename_component(SrcDir ${SrcRealPath} DIRECTORY) get_filename_component(SrcName ${SrcRealPath} NAME_WLE) get_filename_component(SrcExt ${SrcRealPath} LAST_EXT) - set(SrcCopy "${CMAKE_BINARY_DIR}/${SrcDir}/${SrcName}${CompileOutSuffix}${SrcExt}") + set(SrcCopy "${PROJECT_BINARY_DIR}/${SrcDir}/${SrcName}${CompileOutSuffix}${SrcExt}") add_custom_command( OUTPUT ${SrcCopy} COMMAND ${CMAKE_COMMAND} -E copy ${Src} ${SrcCopy} @@ -90,7 +90,7 @@ function(target_sources_custom TgtName CompileOutSuffix) ${SrcCopy} APPEND PROPERTY COMPILE_OPTIONS ${TARGET_SOURCES_CUSTOM_CUSTOM_FLAGS} - -I${CMAKE_SOURCE_DIR}/${SrcDir} + -I${PROJECT_SOURCE_DIR}/${SrcDir} ) endforeach() @@ -176,14 +176,14 @@ endfunction() function(vcs_info Tgt) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/generate_vcs_info.py ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json ${CMAKE_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/generate_vcs_info.py + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/generate_vcs_info.py ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json ${PROJECT_SOURCE_DIR} + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/generate_vcs_info.py ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/vcs_info.py ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c ${CMAKE_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/vcs_info.py ${CMAKE_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/vcs_info.py ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c ${PROJECT_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/vcs_info.py ${PROJECT_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c ${CMAKE_CURRENT_BINARY_DIR}/vcs_info.json ) target_sources(${Tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c) endfunction() @@ -229,7 +229,7 @@ function(use_export_script Target ExportFile) set(EXPORT_SCRIPT_FLAVOR msvc) elseif(APPLE) execute_process( - COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/build/scripts/export_script_gen.py ${ExportFile} - --format darwin + COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/build/scripts/export_script_gen.py ${ExportFile} - --format darwin RESULT_VARIABLE _SCRIPT_RES OUTPUT_VARIABLE _SCRIPT_FLAGS ERROR_VARIABLE _SCRIPT_STDERR @@ -249,8 +249,8 @@ function(use_export_script Target ExportFile) add_custom_command( OUTPUT ${OutPath} COMMAND - Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/export_script_gen.py ${ExportFile} ${OutPath} --format ${EXPORT_SCRIPT_FLAVOR} - DEPENDS ${ExportFile} ${CMAKE_SOURCE_DIR}/build/scripts/export_script_gen.py + Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/export_script_gen.py ${ExportFile} ${OutPath} --format ${EXPORT_SCRIPT_FLAVOR} + DEPENDS ${ExportFile} ${PROJECT_SOURCE_DIR}/build/scripts/export_script_gen.py ) target_sources(${Target} PRIVATE ${OutPath}) set_property(SOURCE ${OutPath} PROPERTY @@ -277,7 +277,7 @@ function(add_yunittest) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack") add_test(NAME ${YUNITTEST_ARGS_NAME} COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack" ${YUNITTEST_ARGS_TEST_ARG}) - set_property(TEST ${YUNITTEST_ARGS_NAME} PROPERTY ENVIRONMENT "source_root=${CMAKE_SOURCE_DIR};build_root=${CMAKE_BINARY_DIR};test_split_factor=${SPLIT_FACTOR};test_split_type=${SPLIT_TYPE}") + set_property(TEST ${YUNITTEST_ARGS_NAME} PROPERTY ENVIRONMENT "source_root=${PROJECT_SOURCE_DIR};build_root=${PROJECT_BINARY_DIR};test_split_factor=${SPLIT_FACTOR};test_split_type=${SPLIT_TYPE}") return() endif() @@ -292,7 +292,7 @@ function(add_yunittest) math(EXPR LastIdx "${SPLIT_FACTOR} - 1") foreach(Idx RANGE ${LastIdx}) add_test(NAME ${YUNITTEST_ARGS_NAME}_${Idx} - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/split_unittest.py --split-factor ${SPLIT_FACTOR} ${FORK_MODE_ARG} --shard ${Idx} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/build/scripts/split_unittest.py --split-factor ${SPLIT_FACTOR} ${FORK_MODE_ARG} --shard ${Idx} $<TARGET_FILE:${YUNITTEST_ARGS_TEST_TARGET}> ${YUNITTEST_ARGS_TEST_ARG}) endforeach() endfunction() diff --git a/build/export_generators/hardcoded-cmake/cmake/cuda.cmake b/build/export_generators/hardcoded-cmake/cmake/cuda.cmake index 5764bb65c3..2d25a6a46f 100644 --- a/build/export_generators/hardcoded-cmake/cmake/cuda.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/cuda.cmake @@ -146,8 +146,8 @@ if (HAVE_CUDA) # use versions from contrib, standard libraries from CUDA distibution are incompatible with MSVC and libcxx set(CUDA_EXTRA_INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR}/contrib/libs/nvidia/thrust - ${CMAKE_SOURCE_DIR}/contrib/libs/nvidia/cub + ${PROJECT_SOURCE_DIR}/contrib/libs/nvidia/thrust + ${PROJECT_SOURCE_DIR}/contrib/libs/nvidia/cub ) find_package(CUDAToolkit REQUIRED) diff --git a/build/export_generators/hardcoded-cmake/cmake/cython.cmake b/build/export_generators/hardcoded-cmake/cmake/cython.cmake index c14d894169..055c742055 100644 --- a/build/export_generators/hardcoded-cmake/cmake/cython.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/cython.cmake @@ -30,7 +30,7 @@ function(target_cython_sources Tgt Scope) set(CppCythonOutput ${CMAKE_CURRENT_BINARY_DIR}/${OutputBase}.cpp) add_custom_command( OUTPUT ${CppCythonOutput} - COMMAND $<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},CYTHON_PYTHON_INTERPRETER>> ${CMAKE_SOURCE_DIR}/contrib/tools/cython/cython.py ${Input} -o ${CppCythonOutput} + COMMAND $<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},CYTHON_PYTHON_INTERPRETER>> ${PROJECT_SOURCE_DIR}/contrib/tools/cython/cython.py ${Input} -o ${CppCythonOutput} "$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},CYTHON_OPTIONS>>,$<SEMICOLON>>" "-I$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},CYTHON_INCLUDE_DIRS>>,$<SEMICOLON>-I>" COMMAND_EXPAND_LISTS diff --git a/build/export_generators/hardcoded-cmake/cmake/fbs.cmake b/build/export_generators/hardcoded-cmake/cmake/fbs.cmake index 8de30b8f61..d612366912 100644 --- a/build/export_generators/hardcoded-cmake/cmake/fbs.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/fbs.cmake @@ -3,27 +3,27 @@ include(common) function(target_fbs_source Tgt Key Src) get_built_tool_path(flatc_bin flatc_dependency contrib/tools/flatc/bin flatc) - file(RELATIVE_PATH fbsRel ${CMAKE_SOURCE_DIR} ${Src}) + file(RELATIVE_PATH fbsRel ${PROJECT_SOURCE_DIR} ${Src}) get_filename_component(OutputBase ${fbsRel} NAME_WLE) - get_filename_component(OutputDir ${CMAKE_BINARY_DIR}/${fbsRel} DIRECTORY) + get_filename_component(OutputDir ${PROJECT_BINARY_DIR}/${fbsRel} DIRECTORY) add_custom_command( OUTPUT - ${CMAKE_BINARY_DIR}/${fbsRel}.h - ${CMAKE_BINARY_DIR}/${fbsRel}.cpp + ${PROJECT_BINARY_DIR}/${fbsRel}.h + ${PROJECT_BINARY_DIR}/${fbsRel}.cpp ${OutputDir}/${OutputBase}.iter.fbs.h ${OutputDir}/${OutputBase}.bfbs COMMAND Python3::Interpreter - ${CMAKE_SOURCE_DIR}/build/scripts/cpp_flatc_wrapper.py + ${PROJECT_SOURCE_DIR}/build/scripts/cpp_flatc_wrapper.py ${flatc_bin} ${FBS_CPP_FLAGS} ${ARGN} - -o ${CMAKE_BINARY_DIR}/${fbsRel}.h + -o ${PROJECT_BINARY_DIR}/${fbsRel}.h ${Src} - DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/cpp_flatc_wrapper.py ${Src} ${flatc_dependency} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + DEPENDS ${PROJECT_SOURCE_DIR}/build/scripts/cpp_flatc_wrapper.py ${Src} ${flatc_dependency} + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) target_sources(${Tgt} ${Key} - ${CMAKE_BINARY_DIR}/${fbsRel}.cpp - ${CMAKE_BINARY_DIR}/${fbsRel}.h + ${PROJECT_BINARY_DIR}/${fbsRel}.cpp + ${PROJECT_BINARY_DIR}/${fbsRel}.h ${OutputDir}/${OutputBase}.iter.fbs.h ) endfunction() diff --git a/build/export_generators/hardcoded-cmake/cmake/global_flags.cmake b/build/export_generators/hardcoded-cmake/cmake/global_flags.cmake index e57e9ebcf9..fc0a2d8499 100644 --- a/build/export_generators/hardcoded-cmake/cmake/global_flags.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/global_flags.cmake @@ -44,7 +44,7 @@ message(VERBOSE "CMAKE_C_FLAGS = \"${CMAKE_C_FLAGS}\"") message(VERBOSE "CMAKE_CXX_FLAGS = \"${CMAKE_CXX_FLAGS}\"") if (NOT CMAKE_CROSSCOMPILING) - set(TOOLS_ROOT ${CMAKE_BINARY_DIR}) + set(TOOLS_ROOT ${PROJECT_BINARY_DIR}) elseif(NOT TOOLS_ROOT) message(FATAL_ERROR "TOOLS_ROOT is required for crosscompilation") endif() diff --git a/build/export_generators/hardcoded-cmake/cmake/protobuf.cmake b/build/export_generators/hardcoded-cmake/cmake/protobuf.cmake index 774f0c7a3e..a445e8b7d2 100644 --- a/build/export_generators/hardcoded-cmake/cmake/protobuf.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/protobuf.cmake @@ -2,7 +2,7 @@ include(common) function(target_proto_plugin Tgt Name PluginTarget) set_property(TARGET ${Tgt} APPEND PROPERTY - PROTOC_OPTS --${Name}_out=${CMAKE_BINARY_DIR}/$<TARGET_PROPERTY:${Tgt},PROTO_NAMESPACE> --plugin=protoc-gen-${Name}=$<TARGET_FILE:${PluginTarget}> + PROTOC_OPTS --${Name}_out=${PROJECT_BINARY_DIR}/$<TARGET_PROPERTY:${Tgt},PROTO_NAMESPACE> --plugin=protoc-gen-${Name}=$<TARGET_FILE:${PluginTarget}> ) set_property(TARGET ${Tgt} APPEND PROPERTY PROTOC_DEPS ${PluginTarget} @@ -27,15 +27,15 @@ function(target_proto_messages Tgt Scope) get_property(ProtocExtraOutsSuf TARGET ${Tgt} PROPERTY PROTOC_EXTRA_OUTS) foreach(proto ${ARGN}) - if(proto MATCHES ${CMAKE_BINARY_DIR}) - file(RELATIVE_PATH protoRel ${CMAKE_BINARY_DIR} ${proto}) - elseif (proto MATCHES ${CMAKE_SOURCE_DIR}) - file(RELATIVE_PATH protoRel ${CMAKE_SOURCE_DIR} ${proto}) + if(proto MATCHES ${PROJECT_BINARY_DIR}) + file(RELATIVE_PATH protoRel ${PROJECT_BINARY_DIR} ${proto}) + elseif (proto MATCHES ${PROJECT_SOURCE_DIR}) + file(RELATIVE_PATH protoRel ${PROJECT_SOURCE_DIR} ${proto}) else() set(protoRel ${proto}) endif() get_filename_component(OutputBase ${protoRel} NAME_WLE) - get_filename_component(OutputDir ${CMAKE_BINARY_DIR}/${protoRel} DIRECTORY) + get_filename_component(OutputDir ${PROJECT_BINARY_DIR}/${protoRel} DIRECTORY) list(TRANSFORM ProtocExtraOutsSuf PREPEND ${OutputDir}/${OutputBase} OUTPUT_VARIABLE ProtocExtraOuts) add_custom_command( OUTPUT @@ -54,7 +54,7 @@ function(target_proto_messages Tgt Scope) $<TARGET_PROPERTY:${Tgt},PROTOC_DEPS> ${protoc_dependency} ${cpp_styleguide_dependency} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND_EXPAND_LISTS ) target_sources(${Tgt} ${Scope} @@ -71,15 +71,15 @@ function(target_ev_messages Tgt Scope) get_property(ProtocExtraOutsSuf TARGET ${Tgt} PROPERTY PROTOC_EXTRA_OUTS) foreach(proto ${ARGN}) - if(proto MATCHES ${CMAKE_BINARY_DIR}) - file(RELATIVE_PATH protoRel ${CMAKE_BINARY_DIR} ${proto}) - elseif (proto MATCHES ${CMAKE_SOURCE_DIR}) - file(RELATIVE_PATH protoRel ${CMAKE_SOURCE_DIR} ${proto}) + if(proto MATCHES ${PROJECT_BINARY_DIR}) + file(RELATIVE_PATH protoRel ${PROJECT_BINARY_DIR} ${proto}) + elseif (proto MATCHES ${PROJECT_SOURCE_DIR}) + file(RELATIVE_PATH protoRel ${PROJECT_SOURCE_DIR} ${proto}) else() set(protoRel ${proto}) endif() get_filename_component(OutputBase ${protoRel} NAME_WLE) - get_filename_component(OutputDir ${CMAKE_BINARY_DIR}/${protoRel} DIRECTORY) + get_filename_component(OutputDir ${PROJECT_BINARY_DIR}/${protoRel} DIRECTORY) list(TRANSFORM ProtocExtraOutsSuf PREPEND ${OutputDir}/${OutputBase} OUTPUT_VARIABLE ProtocExtraOuts) add_custom_command( OUTPUT @@ -100,7 +100,7 @@ function(target_ev_messages Tgt Scope) ${protoc_dependency} ${cpp_styleguide_dependency} ${event2cpp_dependency} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND_EXPAND_LISTS ) target_sources(${Tgt} ${Scope} diff --git a/build/export_generators/hardcoded-cmake/cmake/recursive_library.cmake b/build/export_generators/hardcoded-cmake/cmake/recursive_library.cmake index f3596edcbc..04b5f76cb1 100644 --- a/build/export_generators/hardcoded-cmake/cmake/recursive_library.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/recursive_library.cmake @@ -29,8 +29,8 @@ function(add_recursive_library Target) target_link_options(${Target} PRIVATE "/MANIFEST:NO") endif() string(CONCAT CXX_LINKER_LAUNCHER_CMD "${Python3_EXECUTABLE}" - ";${CMAKE_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py" - ";--cmake-binary-dir;${CMAKE_BINARY_DIR}" + ";${PROJECT_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py" + ";--cmake-binary-dir;${PROJECT_BINARY_DIR}" ";--cmake-ar;${CMAKE_AR}" ";--cmake-ranlib;${CMAKE_RANLIB}" ";--cmake-host-system-name;${CMAKE_HOST_SYSTEM_NAME}" @@ -44,7 +44,7 @@ function(add_recursive_library Target) set_property(TARGET ${Target} PROPERTY CXX_LINKER_LAUNCHER ${CXX_LINKER_LAUNCHER_CMD}) set_property(TARGET ${Target} PROPERTY LINK_DEPENDS - "${CMAKE_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py" - ";${CMAKE_SOURCE_DIR}/build/scripts/link_lib.py" + "${PROJECT_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py" + ";${PROJECT_SOURCE_DIR}/build/scripts/link_lib.py" ) endfunction() diff --git a/build/export_generators/hardcoded-cmake/cmake/swig.cmake b/build/export_generators/hardcoded-cmake/cmake/swig.cmake index d4bb2a2536..9ab29f914e 100644 --- a/build/export_generators/hardcoded-cmake/cmake/swig.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/swig.cmake @@ -1,4 +1,4 @@ -set(SWIG_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/swig${CMAKE_EXECUTABLE_SUFFIX}) +set(SWIG_EXECUTABLE ${PROJECT_BINARY_DIR}/bin/swig${CMAKE_EXECUTABLE_SUFFIX}) set(SWIG_SOURCE_FILE_EXTENSIONS .swg) function(add_swig_jni_library TgtName) @@ -18,7 +18,7 @@ function(add_swig_jni_library TgtName) CPLUSPLUS On ) - file(RELATIVE_PATH PathInProject ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + file(RELATIVE_PATH PathInProject ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) string(REPLACE "/" "." JVMPackageName ${PathInProject}) string(REPLACE "-" "_" JVMPackageName ${JVMPackageName}) string(PREPEND JVMPackageName "ru.yandex.") @@ -45,7 +45,7 @@ function(add_swig_jni_library TgtName) add_custom_command(TARGET ${TgtName} POST_BUILD COMMAND - ${CMAKE_COMMAND} -DJAVA_SRC_DIR=${OutDirAbs} -DJAVA_LST=${CMAKE_CURRENT_BINARY_DIR}/swig_gen_java.lst -P ${CMAKE_SOURCE_DIR}/build/scripts/gather_swig_java.cmake + ${CMAKE_COMMAND} -DJAVA_SRC_DIR=${OutDirAbs} -DJAVA_LST=${CMAKE_CURRENT_BINARY_DIR}/swig_gen_java.lst -P ${PROJECT_SOURCE_DIR}/build/scripts/gather_swig_java.cmake BYPRODUCTS ${SWIG_JNI_LIB_GEN_JAVA_FILES_LIST} ) endfunction() diff --git a/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja b/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja index fdd774fefe..5c9e735ec3 100644 --- a/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja +++ b/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja @@ -12,8 +12,8 @@ set({{project_name}}_MAX_LINK_JOBS 5 CACHE STRING "Maximum parallel link jobs fo set_property(GLOBAL PROPERTY JOB_POOLS link_jobs=${{ '{' }}{{project_name}}_MAX_LINK_JOBS{{ '}' }}) set(CMAKE_JOB_POOL_LINK link_jobs) -list(APPEND CMAKE_MODULE_PATH ${{ '{' }}CMAKE_BINARY_DIR{{ '}' }} ${{ '{' }}CMAKE_SOURCE_DIR{{ '}' }}/cmake) -include_directories(${{ '{' }}CMAKE_SOURCE_DIR{{ '}' }} ${{ '{' }}CMAKE_BINARY_DIR{{ '}' }}) +list(APPEND CMAKE_MODULE_PATH ${{ '{' }}PROJECT_BINARY_DIR{{ '}' }} ${{ '{' }}PROJECT_SOURCE_DIR{{ '}' }}/cmake) +include_directories(${{ '{' }}PROJECT_SOURCE_DIR{{ '}' }} ${{ '{' }}PROJECT_BINARY_DIR{{ '}' }}) list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure") enable_testing() @@ -26,12 +26,12 @@ include(cmake/global_vars.cmake) {% for path in includes %}include({{path}}) {%endfor%}{% if use_conan %} if (CMAKE_CROSSCOMPILING) - include(${CMAKE_BINARY_DIR}/conan_paths.cmake) + include(${PROJECT_BINARY_DIR}/conan_paths.cmake) else() conan_cmake_autodetect(settings) conan_cmake_install( - PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} - INSTALL_FOLDER ${CMAKE_BINARY_DIR} + PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} + INSTALL_FOLDER ${PROJECT_BINARY_DIR} BUILD missing REMOTE conancenter SETTINGS ${settings} diff --git a/build/scripts/create_recursive_library_for_cmake.py b/build/scripts/create_recursive_library_for_cmake.py index 11c80fb0d2..5be06dc37b 100644 --- a/build/scripts/create_recursive_library_for_cmake.py +++ b/build/scripts/create_recursive_library_for_cmake.py @@ -46,7 +46,7 @@ class Opts(object): self.preserved_options = [] - # these variables can contain paths absolute or relative to CMAKE_BINARY_DIR + # these variables can contain paths absolute or relative to project_binary_dir self.global_libs_and_objects_input = [] self.non_global_libs_input = [] self.output = None @@ -57,7 +57,7 @@ class Opts(object): (these use absolute paths). If it is a library that is added from some other path (like CUDA) return True """ - return not (os.path.exists(path) or os.path.exists(os.path.join(self.parsed_args.cmake_binary_dir, path))) + return not (os.path.exists(path) or os.path.exists(os.path.join(self.parsed_args.project_binary_dir, path))) def process_input(args): i = 0 @@ -143,7 +143,7 @@ class FilesCombiner(object): archiver_tool_path, arch_type, 'gnu', # llvm_ar_format, used only if arch_type == 'LLVM_AR' - opts.parsed_args.cmake_binary_dir, + opts.parsed_args.project_binary_dir, 'None', # plugin. Unused for now ] # the remaining archiving cmd args are [output, .. input .. ] |