Skip to content

Commit

Permalink
[libdivide] update to 5.2.0 (#43498)
Browse files Browse the repository at this point in the history
  • Loading branch information
toge authored Jan 29, 2025
1 parent ab42fb3 commit fc97d3e
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 20 deletions.
34 changes: 20 additions & 14 deletions ports/libdivide/no-werror.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7800a13..f01a139 100644
index 136400d..f54a722 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,10 +15,10 @@ include(CMakeSanitize)

@@ -15,15 +15,15 @@ include(CMakePushCheckState)
# Maximum warnings level & warnings as error
add_compile_options(
- "$<$<CXX_COMPILER_ID:MSVC>:/W4;/WX>"
- "$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic;-Werror>"
- "$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic;-Werror>"
- "$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic;-Werror>"
+ "$<$<CXX_COMPILER_ID:MSVC>:/W4>"
+ "$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic>"
+ "$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic>"
+ "$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic>"
)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") # clang-cl
- add_compile_options("/W4;/WX;")
+ add_compile_options("/W4")
else() # clang native
- add_compile_options("-Wall;-Wextra;-pedantic;-Werror")
+ add_compile_options("-Wall;-Wextra;-pedantic")
endif()
else()
add_compile_options(
- "$<$<CXX_COMPILER_ID:MSVC>:/W4;/WX>"
- "$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic;-Werror>"
- "$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic;-Werror>"
+ "$<$<CXX_COMPILER_ID:MSVC>:/W4>"
+ "$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic>"
+ "$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic>"
)
endif()

# Build options ################################################
7 changes: 3 additions & 4 deletions ports/libdivide/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ridiculousfish/libdivide
REF "v${VERSION}"
SHA512 1c94dabca83984ef8190ba91b328e5e994a9bc41b4f4b6800d7417db3312283576759ba3039741a4f045adab6f0391b82ba93523b802bb6a37bc3fd693a80e05
SHA512 1a429b436e545360fb898e059ce689f5123d3fce25242d5a54e52588b75c97008918c1dc5e43f537eb8b2e61577339955ca66d9bbb0eb4440a00500a8a146ccf
HEAD_REF master
PATCHES
no-werror.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
test BUILD_TESTS
test LIBDIVIDE_BUILD_TESTS
)

vcpkg_cmake_configure(
Expand All @@ -21,7 +21,6 @@ vcpkg_cmake_configure(
-DLIBDIVIDE_AVX2=OFF
-DLIBDIVIDE_AVX512=OFF
-DLIBDIVIDE_NEON=OFF
-DENABLE_VECTOR_EXTENSIONS=OFF
)

vcpkg_cmake_install()
Expand All @@ -32,4 +31,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/libdivide/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libdivide",
"version": "5.1",
"version": "5.2.0",
"description": "libdivide.h is a header-only C/C++ library for optimizing integer division.",
"homepage": "https://github.com/ridiculousfish/libdivide",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4445,7 +4445,7 @@
"port-version": 11
},
"libdivide": {
"baseline": "5.1",
"baseline": "5.2.0",
"port-version": 0
},
"libdjinterop": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libdivide.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e81740fc7d610d3c1f30867c8aa127c7db25bcd",
"version": "5.2.0",
"port-version": 0
},
{
"git-tree": "ad57bd243a7411f834cb0dafae9f2b4ffa76c0a3",
"version": "5.1",
Expand Down

0 comments on commit fc97d3e

Please sign in to comment.