diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-28 20:59:02 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-28 20:59:02 -0400 |
| commit | 3fbfe975b9261b04d1657f957ebd466470906e1f (patch) | |
| tree | ae7ad4e2555bf21582b63d34d5656bd8e66e2e42 /cpp/src | |
| parent | Build only C++ with Visual Studio 2010 (diff) | |
| download | ice-3fbfe975b9261b04d1657f957ebd466470906e1f.tar.bz2 ice-3fbfe975b9261b04d1657f957ebd466470906e1f.tar.xz ice-3fbfe975b9261b04d1657f957ebd466470906e1f.zip | |
Fixed elevation level and default name for debug exes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/iceserviceinstall/ServiceInstaller.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp index 824a8dceebb..f5637c03b4e 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp +++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp @@ -126,11 +126,7 @@ IceServiceInstaller::install(const PropertiesPtr& properties) throw "Can't get full path to service installer!"; } - imagePath = serviceInstallerPath + '\\' + serviceTypeToLowerString(_serviceType); -#ifdef _DEBUG - imagePath += 'd'; -#endif - imagePath += ".exe"; + imagePath = serviceInstallerPath + '\\' + serviceTypeToLowerString(_serviceType) + ".exe"; } else { diff --git a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj index e3fc084ce23..0f6b213bb36 100644 --- a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj +++ b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj @@ -63,6 +63,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Link> <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <UACExecutionLevel>RequireAdministrator</UACExecutionLevel> </Link> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -71,6 +72,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Link> <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <UACExecutionLevel>RequireAdministrator</UACExecutionLevel> </Link> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -79,6 +81,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Link> <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <UACExecutionLevel>RequireAdministrator</UACExecutionLevel> </Link> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -87,6 +90,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Link> <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <UACExecutionLevel>RequireAdministrator</UACExecutionLevel> </Link> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |