diff --git a/CMakeLists.txt b/CMakeLists.txt index 273a93f4..02e017fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,12 @@ if(PROJECT_BUILD) include(project.cmake) 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}\") endif() 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}\") endif() else() diff --git a/scripts/make_package.sh b/scripts/make_package.sh index bc53ef76..a270f322 100644 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -8,12 +8,12 @@ CURRENT_DIR=$(realpath ${CURRENT_DIR}) . "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7" -if [ -f "${CURRENT_DIR}/../dist/version.sh" ]; then - source ${CURRENT_DIR}/../dist/version.sh +if [ -f "${CURRENT_DIR}/../build/version.sh" ]; then + source ${CURRENT_DIR}/../build/version.sh fi -if [ -f "${CURRENT_DIR}/../dist/git_rev.sh" ]; then - source ${CURRENT_DIR}/../dist/git_rev.sh +if [ -f "${CURRENT_DIR}/../build/git_rev.sh" ]; then + source ${CURRENT_DIR}/../build/git_rev.sh fi function exit_and_clean() {