GNOME.org
 

[atkmm] Visual Studio builds: Require Visual Studio 2017

commit 2e9c77eaced1d588e1ee60e08f44a77d3228bf3b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 14 16:13:31 2017 +0800

    Visual Studio builds: Require Visual Studio 2017
    
    As atkmm master needs C++-14 features that is only fully supported on
    Visual Studio 2017, update the projects to become 2017 projects.
    
    Also make sure that we depend on libsigc++-3.x and glibmm-2.52+, and
    make them settings in property sheets so that it is easier to bump these
    versions if they need to be updated in the future.

 .../atkmm-build-defines.props                      |    6 +++---
 {MSVC_Net2013 => MSVC_Net2017}/atkmm-install.props |    0
 .../atkmm-version-paths.props                      |   18 +++++++++++++++---
 {MSVC_Net2013 => MSVC_Net2017}/atkmm.sln           |    2 +-
 {MSVC_Net2013 => MSVC_Net2017}/atkmm.vcxproj       |    8 ++++----
 .../atkmm.vcxproj.filters                          |    0
 MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc       |    3 +++
 MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc.in    |    3 +++
 MSVC_Net2017/atkmm/PaxHeaders.15870/atkmmconfig.h  |    3 +++
 {MSVC_Net2013 => MSVC_Net2017}/atkmm/atkmm.rc.in   |    0
 {MSVC_Net2013 => MSVC_Net2017}/filelist.am         |    2 +-
 {MSVC_Net2013 => MSVC_Net2017}/gendef.vcxproj      |    8 ++++----
 .../gendef.vcxproj.filters                         |    0
 MSVC_Net2017/gendef/PaxHeaders.15870/gendef.cc     |    3 +++
 {MSVC_Net2013 => MSVC_Net2017}/gendef/gendef.cc    |    0
 {MSVC_Net2013 => MSVC_Net2017}/install.vcxproj     |    8 ++++----
 Makefile.am                                        |    4 ++--
 configure.ac                                       |    6 +++---
 18 files changed, 49 insertions(+), 25 deletions(-)
---
diff --git a/MSVC_Net2013/atkmm-build-defines.props b/MSVC_Net2017/atkmm-build-defines.props
similarity index 67%
rename from MSVC_Net2013/atkmm-build-defines.props
rename to MSVC_Net2017/atkmm-build-defines.props
index 421f5c3..91735c7 100644
--- a/MSVC_Net2013/atkmm-build-defines.props
+++ b/MSVC_Net2017/atkmm-build-defines.props
@@ -5,8 +5,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <AtkMMBuildDefs>ATKMM_BUILD</AtkMMBuildDefs>
-    <CPPDepLibsRelease>glibmm-vc$(VSVer)0-2_4.lib;sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
-    <CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-2_4.lib;sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
+    
<CPPDepLibsRelease>glibmm-vc$(VSVer)0-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;sigc-vc$(VSVer)0-$(SigCMajorVersion)_0.lib</CPPDepLibsRelease>
+    
<CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;sigc-vc$(VSVer)0-d-$(SigCMajorVersion)_0.lib</CPPDepLibsDebug>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>panogmmbuilddefinesprops</_PropertySheetDisplayName>
@@ -15,7 +15,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      
<AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-$(GLibMMMajorVersion).$(GLibMMMinorVersion);$(GlibEtcInstallRoot)\lib\glibmm-$(GLibMMMajorVersion).$(GLibMMMinorVersion)\include;$(GlibEtcInstallRoot)\include\sigc++-$(SigCMajorVersion).0;$(GlibEtcInstallRoot)\lib\sigc++-$(SigCMajorVersion).0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
diff --git a/MSVC_Net2013/atkmm-install.props b/MSVC_Net2017/atkmm-install.props
similarity index 100%
rename from MSVC_Net2013/atkmm-install.props
rename to MSVC_Net2017/atkmm-install.props
diff --git a/MSVC_Net2013/atkmm-version-paths.props b/MSVC_Net2017/atkmm-version-paths.props
similarity index 72%
rename from MSVC_Net2013/atkmm-version-paths.props
rename to MSVC_Net2017/atkmm-version-paths.props
index affd50f..e26eaa4 100644
--- a/MSVC_Net2013/atkmm-version-paths.props
+++ b/MSVC_Net2017/atkmm-version-paths.props
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup Label="UserMacros">
-    <VSVer>12</VSVer>
+    <VSVer>15</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
-    <ApiMajorVersion>1</ApiMajorVersion>
-    <ApiMinorVersion>6</ApiMinorVersion>
+    <ApiMajorVersion>2</ApiMajorVersion>
+    <ApiMinorVersion>26</ApiMinorVersion>
     <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
     <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
+    <SigCMajorVersion>3</SigCMajorVersion>
+    <GLibMMMajorVersion>2</GLibMMMajorVersion>
+    <GLibMMMinorVersion>52</GLibMMMinorVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>atkmmversionpathsprops</_PropertySheetDisplayName>
@@ -38,5 +41,14 @@
     <BuildMacro Include="DebugDllSuffix">
       <Value>$(DebugDllSuffix)</Value>
     </BuildMacro>
+    <BuildMacro Include="SigCMajorVersion">
+      <Value>$(SigCMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GLibMMMajorVersion">
+      <Value>$(GLibMMMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GLibMMMinorVersion">
+      <Value>$(GLibMMMinorVersion)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MSVC_Net2013/atkmm.sln b/MSVC_Net2017/atkmm.sln
similarity index 97%
rename from MSVC_Net2013/atkmm.sln
rename to MSVC_Net2017/atkmm.sln
index 0be4b8d..0423495 100644
--- a/MSVC_Net2013/atkmm.sln
+++ b/MSVC_Net2017/atkmm.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 15
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atkmm", "atkmm.vcxproj", 
"{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef.vcxproj", 
"{07324745-C9BE-4D65-B08A-9C88188C0C28}"
diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2017/atkmm.vcxproj
similarity index 98%
rename from MSVC_Net2013/atkmm.vcxproj
rename to MSVC_Net2017/atkmm.vcxproj
index c3db50a..9080d37 100644
--- a/MSVC_Net2013/atkmm.vcxproj
+++ b/MSVC_Net2017/atkmm.vcxproj
@@ -27,22 +27,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/atkmm.vcxproj.filters b/MSVC_Net2017/atkmm.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/atkmm.vcxproj.filters
rename to MSVC_Net2017/atkmm.vcxproj.filters
diff --git a/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc
new file mode 100644
index 0000000..b1d908a
--- /dev/null
+++ b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc
@@ -0,0 +1,3 @@
+30 mtime=1489470118.588239788
+30 atime=1489470118.684241719
+30 ctime=1489470186.349583823
diff --git a/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc.in b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc.in
new file mode 100644
index 0000000..19cf094
--- /dev/null
+++ b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmm.rc.in
@@ -0,0 +1,3 @@
+30 mtime=1489470095.775778675
+30 atime=1489470118.584239708
+30 ctime=1489470186.361584058
diff --git a/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmmconfig.h 
b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmmconfig.h
new file mode 100644
index 0000000..e9367ae
--- /dev/null
+++ b/MSVC_Net2017/atkmm/PaxHeaders.15870/atkmmconfig.h
@@ -0,0 +1,3 @@
+29 mtime=1489470118.69624196
+30 atime=1489470137.340615474
+30 ctime=1489470186.353583901
diff --git a/MSVC_Net2013/atkmm/atkmm.rc.in b/MSVC_Net2017/atkmm/atkmm.rc.in
similarity index 100%
rename from MSVC_Net2013/atkmm/atkmm.rc.in
rename to MSVC_Net2017/atkmm/atkmm.rc.in
diff --git a/MSVC_Net2013/filelist.am b/MSVC_Net2017/filelist.am
similarity index 92%
rename from MSVC_Net2013/filelist.am
rename to MSVC_Net2017/filelist.am
index 96970fd..2a7dd65 100644
--- a/MSVC_Net2013/filelist.am
+++ b/MSVC_Net2017/filelist.am
@@ -1,6 +1,6 @@
 ## This file is part of atkmm.
 
-msvc_net2013_data =                    \
+msvc_net2017_data =                    \
        atkmm.sln                       \
        atkmm-build-defines.props       \
        atkmm-version-paths.props       \
diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2017/gendef.vcxproj
similarity index 97%
rename from MSVC_Net2013/gendef.vcxproj
rename to MSVC_Net2017/gendef.vcxproj
index 554054c..7431d2e 100644
--- a/MSVC_Net2013/gendef.vcxproj
+++ b/MSVC_Net2017/gendef.vcxproj
@@ -26,22 +26,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/gendef.vcxproj.filters b/MSVC_Net2017/gendef.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/gendef.vcxproj.filters
rename to MSVC_Net2017/gendef.vcxproj.filters
diff --git a/MSVC_Net2017/gendef/PaxHeaders.15870/gendef.cc b/MSVC_Net2017/gendef/PaxHeaders.15870/gendef.cc
new file mode 100644
index 0000000..0f54d83
--- /dev/null
+++ b/MSVC_Net2017/gendef/PaxHeaders.15870/gendef.cc
@@ -0,0 +1,3 @@
+30 mtime=1489470095.775778675
+30 atime=1489470137.332615315
+30 ctime=1489470186.349583823
diff --git a/MSVC_Net2013/gendef/gendef.cc b/MSVC_Net2017/gendef/gendef.cc
similarity index 100%
rename from MSVC_Net2013/gendef/gendef.cc
rename to MSVC_Net2017/gendef/gendef.cc
diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2017/install.vcxproj
similarity index 97%
rename from MSVC_Net2013/install.vcxproj
rename to MSVC_Net2017/install.vcxproj
index 6225a66..098d940 100644
--- a/MSVC_Net2013/install.vcxproj
+++ b/MSVC_Net2017/install.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Makefile.am b/Makefile.am
index 1952465..4e7a5f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,10 +39,10 @@ nodist_atkmm_libinclude_HEADERS = atk/atkmmconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = atk/$(ATKMM_MODULE_NAME).pc
 
-include $(srcdir)/MSVC_Net2013/filelist.am
+include $(srcdir)/MSVC_Net2017/filelist.am
 
 text_files = COPYING.tools
-msvc_files = $(addprefix MSVC_Net2013/,$(msvc_net2013_data))
+msvc_files = $(addprefix MSVC_Net2017/,$(msvc_net2017_data))
 
 dist_noinst_DATA = $(text_files) $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
diff --git a/configure.ac b/configure.ac
index 7f71606..4f9ac9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,9 +78,9 @@ AC_CONFIG_FILES([Makefile
                  atk/atkmm/Makefile
                  doc/Makefile
                  doc/reference/Doxyfile
-                 MSVC_Net2013/atkmm/atkmm.rc])
+                 MSVC_Net2017/atkmm/atkmm.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2013/atkmm/atkmmconfig.h],
-                   [cp -f atk/atkmmconfig.h MSVC_Net2013/atkmm/atkmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2017/atkmm/atkmmconfig.h],
+                   [cp -f atk/atkmmconfig.h MSVC_Net2017/atkmm/atkmmconfig.h])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]