diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-07-08 23:44:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-11 11:34:49 +0000 |
| commit | 729e26426c88f9bba7e4d9b79d43fb4c9553d179 (patch) | |
| tree | 9a4fd3b83e892478ce986217605ea39ce73a6e50 /external/cppunit | |
| parent | 83cfe896973075a2b07453d9de548f625511fa63 (diff) | |
VS2013: Adjust cppunit to 12.0 vcproj version
Change-Id: I9223fc0620bf31389ab4ea0971835dd7a27feb7e
Reviewed-on: https://gerrit.libreoffice.org/10159
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/cppunit')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 9e678282e437..5c62c9602759 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -17,8 +17,9 @@ 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 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ - /p:VisualStudioVersion=11.0)" \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0)" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ |