diff options
| author | Jose <jose@zeroc.com> | 2018-04-18 17:37:34 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-04-18 17:37:34 +0200 |
| commit | b0e676d596d6f1beb9cb75c51d5dc7eeebfe43c0 (patch) | |
| tree | cdb88ceb92277d8486f24dc131b4892a9ca341cc /cpp | |
| parent | Disable warning C5033: 'register' is no longer a supported (diff) | |
| download | ice-b0e676d596d6f1beb9cb75c51d5dc7eeebfe43c0.tar.bz2 ice-b0e676d596d6f1beb9cb75c51d5dc7eeebfe43c0.tar.xz ice-b0e676d596d6f1beb9cb75c51d5dc7eeebfe43c0.zip | |
Do not overwrite user local debugger environment
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v100.targets | 2 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v120.targets | 2 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v140.targets | 2 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v141.targets | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/msbuild/zeroc.ice.v100.targets b/cpp/msbuild/zeroc.ice.v100.targets index e8216f427b6..c25df169ac0 100644 --- a/cpp/msbuild/zeroc.ice.v100.targets +++ b/cpp/msbuild/zeroc.ice.v100.targets @@ -13,7 +13,7 @@ <PropertyGroup Condition="'$(PlatformToolset)' == 'v100'"> <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> + <LocalDebuggerEnvironment Condition="'$(LocalDebuggerEnvironment)' == ''">PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v100'"> diff --git a/cpp/msbuild/zeroc.ice.v120.targets b/cpp/msbuild/zeroc.ice.v120.targets index 51053ea0c0e..91fcbef3315 100644 --- a/cpp/msbuild/zeroc.ice.v120.targets +++ b/cpp/msbuild/zeroc.ice.v120.targets @@ -13,7 +13,7 @@ <PropertyGroup Condition="'$(PlatformToolset)' == 'v120'"> <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> + <LocalDebuggerEnvironment Condition="'$(LocalDebuggerEnvironment)' == ''">PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v120'"> diff --git a/cpp/msbuild/zeroc.ice.v140.targets b/cpp/msbuild/zeroc.ice.v140.targets index ca59fd48135..9cf1c935e24 100644 --- a/cpp/msbuild/zeroc.ice.v140.targets +++ b/cpp/msbuild/zeroc.ice.v140.targets @@ -13,7 +13,7 @@ <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'"> <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> + <LocalDebuggerEnvironment Condition="'$(LocalDebuggerEnvironment)' == ''">PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v140'"> diff --git a/cpp/msbuild/zeroc.ice.v141.targets b/cpp/msbuild/zeroc.ice.v141.targets index a69d9f92528..2bdfcf31a74 100644 --- a/cpp/msbuild/zeroc.ice.v141.targets +++ b/cpp/msbuild/zeroc.ice.v141.targets @@ -13,7 +13,7 @@ <PropertyGroup Condition="'$(PlatformToolset)' == 'v141'"> <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> + <LocalDebuggerEnvironment Condition="'$(LocalDebuggerEnvironment)' == ''">PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v141'"> |