BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

updated build system

Browse Source
This commit is contained in:
Scott E. Graves 2024-07-09 13:30:49 -05:00
parent 5fb66dc6ee
commit da07122997
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -37,12 +37,12 @@ if(PROJECT_BUILD)
include(project.cmake) include(project.cmake)
if (PROJECT_VERSION) if (PROJECT_VERSION)
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dist/version.sh "export PROJECT_VERSION=${PROJECT_VERSION}") file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build/version.sh "export PROJECT_VERSION=${PROJECT_VERSION}")
add_definitions(-DPROJECT_VERSION=\"${PROJECT_VERSION}\") add_definitions(-DPROJECT_VERSION=\"${PROJECT_VERSION}\")
endif() endif()
if (PROJECT_GIT_REV) if (PROJECT_GIT_REV)
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dist/git_rev.sh "export PROJECT_GIT_REV=${PROJECT_GIT_REV}") file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build/git_rev.sh "export PROJECT_GIT_REV=${PROJECT_GIT_REV}")
add_definitions(-DPROJECT_GIT_REV=\"${PROJECT_GIT_REV}\") add_definitions(-DPROJECT_GIT_REV=\"${PROJECT_GIT_REV}\")
endif() endif()
else() else()

8
scripts/make_package.sh
View File

@ -8,12 +8,12 @@ CURRENT_DIR=$(realpath ${CURRENT_DIR})
. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7" . "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
if [ -f "${CURRENT_DIR}/../dist/version.sh" ]; then if [ -f "${CURRENT_DIR}/../build/version.sh" ]; then
source ${CURRENT_DIR}/../dist/version.sh source ${CURRENT_DIR}/../build/version.sh
fi fi
if [ -f "${CURRENT_DIR}/../dist/git_rev.sh" ]; then if [ -f "${CURRENT_DIR}/../build/git_rev.sh" ]; then
source ${CURRENT_DIR}/../dist/git_rev.sh source ${CURRENT_DIR}/../build/git_rev.sh
fi fi
function exit_and_clean() { function exit_and_clean() {