From db348598a14fd79f5c744db350cef5961486cd7c Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Fri, 29 Jul 2022 11:04:10 -0700 Subject: [PATCH] Update Python target name to Python3 --- CMakeLists.txt | 2 +- bindings/c/CMakeLists.txt | 8 ++++---- bindings/python/CMakeLists.txt | 2 +- cmake/AddFdbTest.cmake | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59161d79b6..5666b1f202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ endif() if (CMAKE_EXPORT_COMPILE_COMMANDS AND WITH_PYTHON) add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/gen_compile_db.py + COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/contrib/gen_compile_db.py ARGS -b ${CMAKE_CURRENT_BINARY_DIR} -s ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/gen_compile_db.py ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json COMMENT "Build compile commands for IDE" diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt index 8b850248de..9e864aa509 100644 --- a/bindings/c/CMakeLists.txt +++ b/bindings/c/CMakeLists.txt @@ -29,7 +29,7 @@ if(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") endif() add_custom_command(OUTPUT ${asm_file} ${CMAKE_CURRENT_BINARY_DIR}/fdb_c_function_pointers.g.h - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/generate_asm.py ${os} ${cpu} + COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/generate_asm.py ${os} ${cpu} ${CMAKE_CURRENT_SOURCE_DIR}/fdb_c.cpp ${asm_file} ${CMAKE_CURRENT_BINARY_DIR}/fdb_c_function_pointers.g.h @@ -65,7 +65,7 @@ endif() if(APPLE) set(symbols ${CMAKE_CURRENT_BINARY_DIR}/fdb_c.symbols) add_custom_command(OUTPUT ${symbols} - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/symbolify.py + COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/symbolify.py ${CMAKE_CURRENT_SOURCE_DIR}/foundationdb/fdb_c.h ${CMAKE_CURRENT_SOURCE_DIR}/foundationdb/fdb_c_internal.h ${symbols} @@ -457,7 +457,7 @@ elseif(NOT WIN32 AND NOT APPLE AND NOT USE_UBSAN) # Linux Only, non-ubsan only ) add_custom_command(OUTPUT ${SHIM_LIB_GEN_SRC} - COMMAND $ ${IMPLIBSO_SRC_DIR}/implib-gen.py + COMMAND $ ${IMPLIBSO_SRC_DIR}/implib-gen.py --target ${CMAKE_SYSTEM_PROCESSOR} --outdir ${SHIM_LIB_OUTPUT_DIR} --dlopen-callback=fdb_shim_dlopen_callback @@ -484,7 +484,7 @@ elseif(NOT WIN32 AND NOT APPLE AND NOT USE_UBSAN) # Linux Only, non-ubsan only target_include_directories(fdb_c_shim_lib_tester PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/ ${CMAKE_SOURCE_DIR}/flow/include) add_test(NAME fdb_c_shim_library_tests - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/test/fdb_c_shim_tests.py + COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/test/fdb_c_shim_tests.py --build-dir ${CMAKE_BINARY_DIR} --unit-tests-bin $ --api-tester-bin $ diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 0f871d8c87..4f5022aa4e 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -68,7 +68,7 @@ endif() set(setup_file_name foundationdb-${FDB_VERSION}.tar.gz) set(package_file ${CMAKE_BINARY_DIR}/packages/foundationdb-${FDB_VERSION}${not_fdb_release_string}.tar.gz) add_custom_command(OUTPUT ${package_file} - COMMAND $ setup.py sdist --formats=gztar && + COMMAND $ setup.py sdist --formats=gztar && ${CMAKE_COMMAND} -E copy dist/${setup_file_name} ${package_file} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Create Python sdist package") diff --git a/cmake/AddFdbTest.cmake b/cmake/AddFdbTest.cmake index c0440df5ef..d2bb22f8a1 100644 --- a/cmake/AddFdbTest.cmake +++ b/cmake/AddFdbTest.cmake @@ -125,7 +125,7 @@ function(add_fdb_test) list(TRANSFORM ADD_FDB_TEST_TEST_FILES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/") if (ENABLE_SIMULATION_TESTS) add_test(NAME ${test_name} - COMMAND $ ${TestRunner} + COMMAND $ ${TestRunner} -n ${test_name} -b ${PROJECT_BINARY_DIR} -t ${test_type}