diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-07 20:50:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-07 20:52:56 +0300 |
| commit | 3efe9b2954797d01970a088eec55817751304b4a (patch) | |
| tree | 6576ccf7a8b1ab1b2c83f4148108694817b1ae0f /external/cppunit | |
| parent | Use gb_DEBUG_CFLAGS to get -FS for VS 2013 (diff) | |
| download | core-3efe9b2954797d01970a088eec55817751304b4a.tar.gz core-3efe9b2954797d01970a088eec55817751304b4a.zip | |
Handle VCVER==120 (VS 2013) too
Change-Id: I4dbf663790bd8906ef8b123a01bdf52e0c0c1962
Diffstat (limited to 'external/cppunit')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 2f3217da3d2b..9e678282e437 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -17,7 +17,7 @@ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ /p:VisualStudioVersion=11.0)" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ |