[cpp-sp] 01/06: Add ARM64 target to IIS project

Rod Widdowson rdw at steadingsoftware.com
Tue Jan 21 14:17:30 UTC 2025


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=966166fa77383afe603e1347633ad7748996a302

commit 966166fa77383afe603e1347633ad7748996a302
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 20 20:12:21 2025 +0000

    Add ARM64 target to IIS project
    
    And make sure that all projects are building the correct targets
    within the configuration manager
---
 Projects/vc22/Shibboleth.sln | 16 +++++-----
 Projects/vc22/iis.vcxproj    | 73 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/Projects/vc22/Shibboleth.sln b/Projects/vc22/Shibboleth.sln
index 6c8f5d9b..764f48ef 100644
--- a/Projects/vc22/Shibboleth.sln
+++ b/Projects/vc22/Shibboleth.sln
@@ -48,8 +48,8 @@ Global
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Debug|x64.Build.0 = Debug|x64
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Debug|x86.ActiveCfg = Debug|Win32
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Debug|x86.Build.0 = Debug|Win32
-		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|ARM64.ActiveCfg = Release|x64
-		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|ARM64.Build.0 = Release|x64
+		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|ARM64.Build.0 = Release|ARM64
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|x64.ActiveCfg = Release|x64
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|x64.Build.0 = Release|x64
 		{CA2655D0-D6AA-41B9-BA7F-4967E88CB96C}.Release|x86.ActiveCfg = Release|Win32
@@ -60,20 +60,20 @@ Global
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Debug|x64.Build.0 = Debug|x64
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Debug|x86.ActiveCfg = Debug|Win32
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Debug|x86.Build.0 = Debug|Win32
-		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|ARM64.ActiveCfg = Release|x64
-		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|ARM64.Build.0 = Release|x64
+		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|ARM64.Build.0 = Release|ARM64
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|x64.ActiveCfg = Release|x64
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|x64.Build.0 = Release|x64
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|x86.ActiveCfg = Release|Win32
 		{3B02FC93-A6ED-495E-8CAB-CB55C6450445}.Release|x86.Build.0 = Release|Win32
-		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|ARM64.ActiveCfg = Debug|x64
-		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|ARM64.Build.0 = Debug|x64
+		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|ARM64.Build.0 = Debug|ARM64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|x64.ActiveCfg = Debug|x64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|x64.Build.0 = Debug|x64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|x86.ActiveCfg = Debug|Win32
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Debug|x86.Build.0 = Debug|Win32
-		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|ARM64.ActiveCfg = Release|x64
-		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|ARM64.Build.0 = Release|x64
+		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|ARM64.Build.0 = Release|ARM64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|x64.ActiveCfg = Release|x64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|x64.Build.0 = Release|x64
 		{3F4D8EC2-FAFF-493D-AC2C-841CA533F037}.Release|x86.ActiveCfg = Release|Win32
diff --git a/Projects/vc22/iis.vcxproj b/Projects/vc22/iis.vcxproj
index 23f88f77..5b5eb235 100644
--- a/Projects/vc22/iis.vcxproj
+++ b/Projects/vc22/iis.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -60,6 +68,12 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -67,6 +81,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -81,9 +102,15 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
@@ -94,9 +121,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -155,6 +188,24 @@
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;IIS_EXPORTS;_WINDOWS;_USRDLL;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -177,6 +228,28 @@
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;IIS_EXPORTS;_WINDOWS;_USRDLL;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list