Skip to content

Commit 153694e

Browse files
committed
- avoid cl : Command line warning D9030: '/Gm' is incompatible with multiprocessing; ignoring /MP switch
- add build dependency between gtest and PythonScript.Tests.vcxproj
1 parent d470c53 commit 153694e

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

PythonScript.Tests/PythonScript.Tests.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8080
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8181
<MultiProcessorCompilation>true</MultiProcessorCompilation>
82+
<MinimalRebuild>false</MinimalRebuild>
8283
</ClCompile>
8384
<Link>
8485
<SubSystem>Console</SubSystem>
@@ -100,6 +101,7 @@
100101
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101102
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
102103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
104+
<MinimalRebuild>false</MinimalRebuild>
103105
</ClCompile>
104106
<Link>
105107
<SubSystem>Console</SubSystem>

PythonScript.Tests/gtest.proj/gtest.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<AdditionalIncludeDirectories>..\gtest\googletest;..\gtest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7272
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
7373
<MultiProcessorCompilation>true</MultiProcessorCompilation>
74+
<MinimalRebuild>false</MinimalRebuild>
7475
</ClCompile>
7576
<Link>
7677
<SubSystem>Windows</SubSystem>
@@ -87,6 +88,7 @@
8788
<AdditionalIncludeDirectories>..\gtest\googletest;..\gtest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8889
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8990
<MultiProcessorCompilation>true</MultiProcessorCompilation>
91+
<MinimalRebuild>false</MinimalRebuild>
9092
</ClCompile>
9193
<Link>
9294
<SubSystem>Windows</SubSystem>

PythonScript.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ EndProject
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript\project\PythonScript2010.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
66
EndProject
77
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript.Tests", "PythonScript.Tests\PythonScript.Tests.vcxproj", "{141C090A-DF76-456E-8B54-1E2C9E5AE75A}"
8+
ProjectSection(ProjectDependencies) = postProject
9+
{2DDE822D-E7AC-4650-B875-D33FADC0EED9} = {2DDE822D-E7AC-4650-B875-D33FADC0EED9}
10+
EndProjectSection
811
EndProject
912
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "PythonScript.Tests\gtest.proj\gtest.vcxproj", "{2DDE822D-E7AC-4650-B875-D33FADC0EED9}"
1013
EndProject
@@ -43,4 +46,7 @@ Global
4346
GlobalSection(SolutionProperties) = preSolution
4447
HideSolutionNode = FALSE
4548
EndGlobalSection
49+
GlobalSection(ExtensibilityGlobals) = postSolution
50+
SolutionGuid = {38C6FC6C-0177-4396-9D07-6E839B8B799A}
51+
EndGlobalSection
4652
EndGlobal

PythonScript/project/PythonScript2010.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107107
<AdditionalIncludeDirectories>../include;../res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108108
<MultiProcessorCompilation>true</MultiProcessorCompilation>
109+
<MinimalRebuild>false</MinimalRebuild>
109110
</ClCompile>
110111
<Link>
111112
<SubSystem>Windows</SubSystem>
@@ -129,6 +130,7 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
129130
<AdditionalIncludeDirectories>../include;../res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130131
<MultiProcessorCompilation>true</MultiProcessorCompilation>
131132
<TreatWarningAsError>true</TreatWarningAsError>
133+
<MinimalRebuild>false</MinimalRebuild>
132134
</ClCompile>
133135
<Link>
134136
<SubSystem>Windows</SubSystem>
@@ -151,6 +153,7 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
151153
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
152154
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153155
<MultiProcessorCompilation>true</MultiProcessorCompilation>
156+
<MinimalRebuild>false</MinimalRebuild>
154157
</ClCompile>
155158
<Link>
156159
<SubSystem>Windows</SubSystem>

0 commit comments

Comments
 (0)