Commit052a81b

authored

CMake update to use /ZH:SHA_256 for clang v16 or later (#115)

1 parent5ca9aab commit052a81bCopy full SHA for 052a81b

File tree

+19

-10

lines changed

+19

-10

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,13 @@ if(MSVC)`
`291`	`291`	`endforeach()`
`292`	`292`	`endif()`
`293`	`293`
	`294`	`+ if((MSVC_VERSIONGREATER_EQUAL 1924)`
	`295`	`+AND ((NOT (CMAKE_CXX_COMPILER_IDMATCHES"Clang"))OR (CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 16.0)))`
	`296`	`+ foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})`
	`297`	`+ target_compile_options(${t}PRIVATE /ZH:SHA_256)`
	`298`	`+ endforeach()`
	`299`	`+ endif()`
	`300`	`+`
`294`	`301`	`if((MSVC_VERSIONGREATER_EQUAL 1928)`
`295`	`302`	`AND (CMAKE_SIZEOF_VOID_PEQUAL 8)`
`296`	`303`	`AND ((NOT (CMAKE_CXX_COMPILER_IDMATCHES"Clang"))OR (CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 13.0)))`
`@@ -355,12 +362,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")`
`355`	`362`	`endforeach()`
`356`	`363`	`endif()`
`357`	`364`
`358`		`- if(CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.24)`
`359`		`- foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})`
`360`		`- target_compile_options(${t}PRIVATE /ZH:SHA_256)`
`361`		`- endforeach()`
`362`		`- endif()`
`363`		`-`
`364`	`365`	`if(CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.26)`
`365`	`366`	`foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})`
`366`	`367`	`target_compile_options(${t}PRIVATE /Zc:preprocessor /wd5105)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,14 @@ jobs:`
`43`	`43`	`fetchTags:false`
`44`	`44`	`-task:NuGetToolInstaller@1`
`45`	`45`	`displayName:'Use NuGet'`
	`46`	`+inputs:`
	`47`	`+versionSpec:'6.5.x'`
`46`	`48`	`-task:NuGetCommand@2`
`47`	`49`	`# We have to use a nuget.config to provide the feed for the 'nuget install' option.`
`48`	`50`	`displayName:'NuGet set package source to ADO feed'`
`49`	`51`	`inputs:`
`50`	`52`	`command:custom`
`51`		`-arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile NuGet.config`
	`53`	`+arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile$(Build.SourcesDirectory)\NuGet.config`
`52`	`54`	`-task:PowerShell@2`
`53`	`55`	`displayName:'Set nuget.config to single source'`
`54`	`56`	`inputs:`
`@@ -140,11 +142,13 @@ jobs:`
`140`	`142`	`fetchTags:false`
`141`	`143`	`-task:NuGetToolInstaller@1`
`142`	`144`	`displayName:'Use NuGet'`
	`145`	`+inputs:`
	`146`	`+versionSpec:'6.5.x'`
`143`	`147`	`-task:NuGetCommand@2`
`144`	`148`	`displayName:NuGet set package source to ADO feed`
`145`	`149`	`inputs:`
`146`	`150`	`command:custom`
`147`		`-arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile NuGet.config`
	`151`	`+arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile$(Build.SourcesDirectory)\NuGet.config`
`148`	`152`	`-task:PowerShell@2`
`149`	`153`	`displayName:'Set nuget.config to single source'`
`150`	`154`	`inputs:`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,14 @@ jobs:`
`43`	`43`	`fetchTags:false`
`44`	`44`	`-task:NuGetToolInstaller@1`
`45`	`45`	`displayName:'Use NuGet'`
	`46`	`+inputs:`
	`47`	`+versionSpec:'6.5.x'`
`46`	`48`	`-task:NuGetCommand@2`
`47`	`49`	`# We have to use a nuget.config to provide the feed for the 'nuget install' option.`
`48`	`50`	`displayName:'NuGet set package source to ADO feed'`
`49`	`51`	`inputs:`
`50`	`52`	`command:custom`
`51`		`-arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile NuGet.config`
	`53`	`+arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile$(Build.SourcesDirectory)\NuGet.config`
`52`	`54`	`-task:PowerShell@2`
`53`	`55`	`displayName:'Set nuget.config to single source'`
`54`	`56`	`inputs:`
`@@ -140,11 +142,13 @@ jobs:`
`140`	`142`	`fetchTags:false`
`141`	`143`	`-task:NuGetToolInstaller@1`
`142`	`144`	`displayName:'Use NuGet'`
	`145`	`+inputs:`
	`146`	`+versionSpec:'6.5.x'`
`143`	`147`	`-task:NuGetCommand@2`
`144`	`148`	`displayName:NuGet set package source to ADO feed`
`145`	`149`	`inputs:`
`146`	`150`	`command:custom`
`147`		`-arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile NuGet.config`
	`151`	`+arguments:sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile$(Build.SourcesDirectory)\NuGet.config`
`148`	`152`	`-task:PowerShell@2`
`149`	`153`	`displayName:'Set nuget.config to single source'`
`150`	`154`	`inputs:`

Comments

(0)