From 2094a752941d2b595e0dd21449161987d5bb99b5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Jan 2016 18:18:06 -0800 Subject: [PATCH] use correct var from packaging properties for copy --- cmake/templates/CPackProperties.cmake.in | 2 +- cmake/templates/NSIS.template.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in index 34c3797209..7b3d0ae53e 100644 --- a/cmake/templates/CPackProperties.cmake.in +++ b/cmake/templates/CPackProperties.cmake.in @@ -18,7 +18,7 @@ set(AC_EXEC_NAME "@AC_EXEC_NAME@") set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@") set(PRODUCTION_BUILD "@PRODUCTION_BUILD@") set(PR_BUILD "@PR_BUILD@") -set(MODIFIED_ORGANIZATION "@MODIFIED_ORGANIZATION@") +set(BUILD_ORGANIZATION "@BUILD_ORGANIZATION@") set(POST_INSTALL_OPTIONS_PATH "@POST_INSTALL_OPTIONS_PATH@") set(CLIENT_COMPONENT_NAME "@CLIENT_COMPONENT@") set(SERVER_COMPONENT_NAME "@SERVER_COMPONENT@") diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 40def20300..097d8c7623 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -975,8 +975,8 @@ Function HandlePostInstallOptions ${If} $CopyFromProductionState == ${BST_CHECKED} ; we need to copy whatever is in the data folder for production build to the data folder for this build - CreateDirectory "$APPDATA\@MODIFIED_ORGANIZATION@" - CopyFiles "$APPDATA\High Fidelity\" "$APPDATA\@MODIFIED_ORGANIZATION@\" + CreateDirectory "$APPDATA\@BUILD_ORGANIZATION@" + CopyFiles "$APPDATA\High Fidelity\" "$APPDATA\@BUILD_ORGANIZATION@\" ${EndIf} ${EndIf}