[openrtm-commit:02831] r3044 - in trunk/OpenRTM-aist: . win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-09-15 16:31:59 +0900 (Fri, 15 Sep 2017)
New Revision: 3044

Modified:
   trunk/OpenRTM-aist/Makefile.am
   trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
   trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
Log:
[compat,->RELENG_1_2] vc2017 version has been changed from vc15 to vc141.  refs #4172

Modified: trunk/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/Makefile.am	2017-09-15 07:14:34 UTC (rev 3043)
+++ trunk/OpenRTM-aist/Makefile.am	2017-09-15 07:31:59 UTC (rev 3044)
@@ -9,7 +9,7 @@
 
 SUBDIRS = build src utils examples etc $(DOCS) win32
 
-export VC_VERSION := 10 11 12 14 15
+export VC_VERSION := 10 11 12 14 141
 
 DIST_SUBDIRS = packages $(SUBDIRS)
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am	2017-09-15 07:14:34 UTC (rev 3043)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am	2017-09-15 07:31:59 UTC (rev 3044)
@@ -59,13 +59,13 @@
 		`find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
 	qkc -O- -ms OpenRTM-aist_vc14.sln
 
-OpenRTM-aist_vc15.sln:
+OpenRTM-aist_vc141.sln:
 	$(top_srcdir)/build/slntool.py      \
-		--vcversion VC15            \
+		--vcversion VC141            \
 		--dep OpenRTM-aist.sln.dep  \
-		--out OpenRTM-aist_vc15.sln \
-		`find ./ -name '*_vc15.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
-	qkc -O- -ms OpenRTM-aist_vc15.sln
+		--out OpenRTM-aist_vc141.sln \
+		`find ./ -name '*_vc141.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+	qkc -O- -ms OpenRTM-aist_vc141.sln
 
 vsprops:  coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in	2017-09-15 07:14:34 UTC (rev 3043)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in	2017-09-15 07:31:59 UTC (rev 3044)
@@ -124,7 +124,7 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx86
    )
-if %VC_VERSION% == 15 (
+if %VC_VERSION% == 141 (
    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
    set VCTOOLSET=15.0
    set PLATFORMTOOL=/p:PlatformToolset=v141
@@ -193,7 +193,7 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx64
    )
-if /i %VC_VERSION% == 15 (
+if /i %VC_VERSION% == 141 (
    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
    set VCTOOLSET=15.0
    set PLATFORMTOOL=/p:PlatformToolset=v141