Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit12a2438

Browse files
authored
Hotfix for CMake switch order (#148)
1 parent6e9b60f commit12a2438

File tree

5 files changed

+15
-19
lines changed

5 files changed

+15
-19
lines changed

‎HISTORY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
99
###February 21, 2024
1010
* CMake project updates and refactor
1111
* Minor code review for Clang, MinGW, and Intel compilers
12+
* uvatlastool: Updated for February 2024 DirectXTex & DirectXMesh releases
1213

1314
###December 31, 2023
1415
* CMake project updates including pkg-config file generation

‎UVAtlasTool/UVAtlasTool_2019.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,14 @@
308308
</ItemGroup>
309309
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
310310
<ImportGroupLabel="ExtensionTargets">
311-
<ImportProject="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
312-
<ImportProject="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
311+
<ImportProject="..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets')" />
312+
<ImportProject="..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets')" />
313313
</ImportGroup>
314314
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
315315
<PropertyGroup>
316316
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
317317
</PropertyGroup>
318-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
319-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
318+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets'))" />
319+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets'))" />
320320
</Target>
321321
</Project>

‎UVAtlasTool/UVAtlasTool_2022.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,14 @@
314314
</ItemGroup>
315315
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
316316
<ImportGroupLabel="ExtensionTargets">
317-
<ImportProject="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
318-
<ImportProject="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
317+
<ImportProject="..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets')" />
318+
<ImportProject="..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets')" />
319319
</ImportGroup>
320320
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
321321
<PropertyGroup>
322322
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
323323
</PropertyGroup>
324-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
325-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
324+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.2.22.1\build\native\directxmesh_desktop_2019.targets'))" />
325+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.2.22.1\build\native\directxtex_desktop_2019.targets'))" />
326326
</Target>
327327
</Project>

‎UVAtlasTool/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="directxmesh_desktop_2019"version="2024.1.1.1"targetFramework="native" />
4-
<packageid="directxtex_desktop_2019"version="2024.1.1.1"targetFramework="native" />
3+
<packageid="directxmesh_desktop_2019"version="2024.2.22.1"targetFramework="native" />
4+
<packageid="directxtex_desktop_2019"version="2024.2.22.1"targetFramework="native" />
55
</packages>

‎build/CompilerAndLinker.cmake‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
8181

8282
if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
8383
message(STATUS"Building using Whole Program Optimization")
84-
list(APPEND /Gy /Gw)
84+
list(APPENDCOMPILER_SWITCHES/Gy /Gw)
8585
endif()
8686

8787
if(OpenMP_CXX_FOUND)
8888
# OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup
89-
list(APPEND /Zc:twoPhase-)
89+
list(APPENDCOMPILER_SWITCHES/Zc:twoPhase-)
9090
endif()
9191

9292
if(CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.24)
@@ -95,9 +95,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
9595

9696
if((CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.26)
9797
AND (NOT (XBOX_CONSOLE_TARGETSTREQUAL"durango")))
98-
foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})
99-
target_compile_options(${t}PRIVATE /Zc:preprocessor /wd5104 /wd5105)
100-
endforeach()
98+
list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105)
10199
endif()
102100

103101
if((CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.27)AND (NOT (${DIRECTX_ARCH}MATCHES"^arm")))
@@ -110,10 +108,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
110108

111109
if((CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.31)
112110
AND (XBOX_CONSOLE_TARGETSTREQUAL"durango"))
113-
114-
foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})
115-
target_compile_options(${t}PRIVATE /Zc:static_assert-)
116-
endforeach()
111+
list(APPEND COMPILER_SWITCHES /Zc:static_assert-)
117112
endif()
118113

119114
if(CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL 19.35)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp