diff --git a/CMakeLists.txt b/CMakeLists.txt index 37c89f95f5..dccd4b86df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ if(TB_ENABLE_ASAN) endif() # Enable SSE4.1 and AVX support for intrinsics (e.g., _mm_blendv_ps) to avoid errors on Linux -if(UNIX) +if(UNIX AND (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx") endif() diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 57e46100b5..2b7e475ff6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1021,7 +1021,8 @@ set(COMMON_HEADER add_library(common OBJECT ${COMMON_SOURCE} ${COMMON_HEADER}) set_target_properties(common PROPERTIES AUTOMOC TRUE) target_include_directories(common PUBLIC ${COMMON_SOURCE_DIR}) -target_link_libraries(common PUBLIC tinyxml2::tinyxml2 kdl vecmath GLEW::GLEW miniz::miniz freeimage::FreeImage freetype OpenGL::GL Qt5::Widgets Qt5::Svg fmt::fmt assimp::assimp tinybvh) +target_link_libraries(common PUBLIC tinyxml2::tinyxml2 kdl vecmath GLEW::GLEW freeimage::FreeImage freetype OpenGL::GL Qt5::Widgets Qt5::Svg fmt::fmt assimp::assimp tinybvh) +target_link_libraries(common PRIVATE miniz::miniz) # use precompiled headers on CMake 3.16 or later if (NOT TB_SUPPRESS_PCH AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") diff --git a/vcpkg.json b/vcpkg.json index 03d2d05d51..f12a8837ec 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -37,6 +37,11 @@ "name": "tinyxml2", "version>=": "9.0.0", "platform": "!linux" + }, + { + "name": "libpng", + "version>=": "1.6.47#0", + "platform": "!linux" } ], "builtin-baseline": "13bde2ff13192e1b2fdd37bd9b475c7665ae6ae5",