diff --git a/cmake/Version.cmake b/cmake/Version.cmake index a9995bb7..ea565eb1 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -74,7 +74,7 @@ else() set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}") endif() -set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}") +set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}-${BARRIER_VERSION_STAGE}") set (BARRIER_VERSION_STRING "${BARRIER_VERSION}-${BARRIER_VERSION_TAG}") message (STATUS "Full Barrier version string is '" ${BARRIER_VERSION_STRING} "'") diff --git a/dist/macos/bundle/build_installer.sh.in b/dist/macos/bundle/build_installer.sh.in index 1fa724c7..b475343c 100755 --- a/dist/macos/bundle/build_installer.sh.in +++ b/dist/macos/bundle/build_installer.sh.in @@ -11,7 +11,7 @@ fi cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1 -B_REREF_SCRIPT=./reref_dylibs.sh +B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/reref_dylibs.sh if [ ! -x $B_REREF_SCRIPT ]; then echo Missing script: $B_REREF_SCRIPT exit 1 @@ -35,7 +35,7 @@ mkdir MacOS || exit 1 cd MacOS || exit 1 # copy all executables -cp @CMAKE_RUNTIME_OUTPUT_DIR@/* . || exit 1 +cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1 # copy the qt platform plugin # TODO: this is hacky and will probably break if there is more than one qt