diff --git a/HISTORY.md b/HISTORY.md index 5236ce7..fd0b5c2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -9,6 +9,7 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/ ### February 21, 2024 * CMake project updates and refactor * Minor code review for Clang, MinGW, and Intel compilers +* uvatlastool: Updated for February 2024 DirectXTex & DirectXMesh releases ### December 31, 2023 * CMake project updates including pkg-config file generation diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj b/UVAtlasTool/UVAtlasTool_2019.vcxproj index 4e351eb..5837ab4 100644 --- a/UVAtlasTool/UVAtlasTool_2019.vcxproj +++ b/UVAtlasTool/UVAtlasTool_2019.vcxproj @@ -308,14 +308,14 @@ - - + + 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}. - - + + \ No newline at end of file diff --git a/UVAtlasTool/UVAtlasTool_2022.vcxproj b/UVAtlasTool/UVAtlasTool_2022.vcxproj index db71fe9..cda6628 100644 --- a/UVAtlasTool/UVAtlasTool_2022.vcxproj +++ b/UVAtlasTool/UVAtlasTool_2022.vcxproj @@ -314,14 +314,14 @@ - - + + 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}. - - + + \ No newline at end of file diff --git a/UVAtlasTool/packages.config b/UVAtlasTool/packages.config index 4e63c58..d3722b0 100644 --- a/UVAtlasTool/packages.config +++ b/UVAtlasTool/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake index 9a9612f..ee290fc 100644 --- a/build/CompilerAndLinker.cmake +++ b/build/CompilerAndLinker.cmake @@ -81,12 +81,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(CMAKE_INTERPROCEDURAL_OPTIMIZATION) message(STATUS "Building using Whole Program Optimization") - list(APPEND /Gy /Gw) + list(APPEND COMPILER_SWITCHES /Gy /Gw) endif() if(OpenMP_CXX_FOUND) # OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup - list(APPEND /Zc:twoPhase-) + list(APPEND COMPILER_SWITCHES /Zc:twoPhase-) endif() if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24) @@ -95,9 +95,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26) AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango"))) - foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) - target_compile_options(${t} PRIVATE /Zc:preprocessor /wd5104 /wd5105) - endforeach() + list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105) endif() if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm"))) @@ -110,10 +108,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31) AND (XBOX_CONSOLE_TARGET STREQUAL "durango")) - - foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) - target_compile_options(${t} PRIVATE /Zc:static_assert-) - endforeach() + list(APPEND COMPILER_SWITCHES /Zc:static_assert-) endif() if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)