Ensured that the name of the packages within cmake remains the same as that within make

This commit is contained in:
Alvin Moore 2019-12-16 00:11:52 -08:00
parent 413cafe368
commit 0c4c93a041
2 changed files with 6 additions and 6 deletions

View File

@ -62,11 +62,11 @@ endif()
if(NOT FDB_RELEASE)
set(prerelease_string "a1")
endif()
set(package_file_name foundationdb-${FDB_VERSION}${prerelease_string}.tar.gz)
set(package_file ${CMAKE_BINARY_DIR}/packages/${package_file_name})
set(setup_file_name foundationdb-${FDB_VERSION}.tar.gz)
set(package_file ${CMAKE_BINARY_DIR}/packages/foundationdb-${FDB_VERSION}${prerelease_string}.tar.gz)
add_custom_command(OUTPUT ${package_file}
COMMAND $<TARGET_FILE:Python::Interpreter> setup.py sdist --formats=gztar &&
${CMAKE_COMMAND} -E copy dist/${package_file_name} ${package_file}
${CMAKE_COMMAND} -E copy dist/${setup_file_name} ${package_file}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Create Python sdist package")
add_custom_target(python_package DEPENDS ${package_file})

View File

@ -8,11 +8,11 @@ if(NOT FDB_RELEASE)
set(prerelease_string "PRERELEASE")
endif()
set(gem_file fdb-${FDB_VERSION}${prerelease_string}.gem)
set(gem_target ${CMAKE_BINARY_DIR}/packages/${gem_file})
set(setup_file fdb-${FDB_VERSION}.gem)
set(gem_target ${CMAKE_BINARY_DIR}/packages/fdb-${FDB_VERSION}${prerelease_string}.gem)
add_custom_command(OUTPUT ${gem_target}
COMMAND ${GEM_COMMAND} build fdb.gemspec &&
${CMAKE_COMMAND} -E copy ${gem_file} ${gem_target}
${CMAKE_COMMAND} -E copy ${setup_file} ${gem_target}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Building ruby gem")
add_custom_target(gem_package DEPENDS ${gem_target})