diff --git a/recipes/simdutf/all/conandata.yml b/recipes/simdutf/all/conandata.yml index 2a8f8d281bcc9..8f8f558da1429 100644 --- a/recipes/simdutf/all/conandata.yml +++ b/recipes/simdutf/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "5.2.6": + url: "https://github.com/simdutf/simdutf/archive/v5.2.6.tar.gz" + sha256: "ab9e56facf7cf05f4e9d062a0adef310fc6a0f82a8132e8ec1e1bb7ab5e234df" "5.2.3": url: "https://github.com/simdutf/simdutf/archive/v5.2.3.tar.gz" sha256: "dfa55d85c3ee51e9b52e55c02701b16f83dcf1921e1075b67f99b1036df5adb8" @@ -23,57 +26,8 @@ sources: "3.2.17": url: "https://github.com/simdutf/simdutf/archive/v3.2.17.tar.gz" sha256: "c24e3eec1e08522a09b33e603352e574f26d367a7701bf069a65881f64acd519" - "3.2.15": - url: "https://github.com/simdutf/simdutf/archive/v3.2.15.tar.gz" - sha256: "c26d2e2e9124e1c20335d3880d74c8b0d74a5e247ba82ef82d15df4ccc413bcd" - "3.2.14": - url: "https://github.com/simdutf/simdutf/archive/v3.2.14.tar.gz" - sha256: "6bd6cd41e0e588312c3ae24adb297454bd9bd9622ed7443f41300d7201f233a1" - "3.2.2": - url: "https://github.com/simdutf/simdutf/archive/v3.2.2.tar.gz" - sha256: "5a5c84c05bf30d681126d1dcbde903615f2c927e201e0c6d489f74a91b7f506f" - "3.2.0": - url: "https://github.com/simdutf/simdutf/archive/v3.2.0.tar.gz" - sha256: "0d9f63e2f308b6b54f399ebbe3a02776b902a2670c88c28de2d75ea2197dc4e9" - "3.1.0": - url: "https://github.com/simdutf/simdutf/archive/v3.1.0.tar.gz" - sha256: "9757a04085ad3ebab9fe933d9198ec6b84a857632a540418b6cfeb7b889a8017" - "3.0.0": - url: "https://github.com/simdutf/simdutf/archive/v3.0.0.tar.gz" - sha256: "cc23b47fd0caf9018fc0dcf49ebeff2676654fff997f9f6ce50fa93cd36f661f" - "2.2.0": - url: "https://github.com/simdutf/simdutf/archive/v2.2.0.tar.gz" - sha256: "b0b8527e194700363cc47e75a7b8d58c88798b0dc31671f5ae5c8803d8678fe6" patches: "3.2.17": - patch_file: "patches/3.2.17-0001-fix-cmake.patch" patch_description: "remove static build, enable rpath on macOS" patch_type: "conan" - "3.2.15": - - patch_file: "patches/3.2.14-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "3.2.14": - - patch_file: "patches/3.2.14-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "3.2.2": - - patch_file: "patches/2.0.3-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "3.2.0": - - patch_file: "patches/2.0.3-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "3.1.0": - - patch_file: "patches/2.0.3-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "3.0.0": - - patch_file: "patches/2.0.3-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" - "2.2.0": - - patch_file: "patches/2.0.3-0001-fix-cmake.patch" - patch_description: "remove static build, enable rpath on macOS" - patch_type: "conan" diff --git a/recipes/simdutf/all/conanfile.py b/recipes/simdutf/all/conanfile.py index 6e0a2cc78bceb..69d83bcb2ced4 100644 --- a/recipes/simdutf/all/conanfile.py +++ b/recipes/simdutf/all/conanfile.py @@ -62,10 +62,7 @@ def source(self): def generate(self): tc = CMakeToolchain(self) tc.variables["SIMDUTF_BENCHMARKS"] = False - if Version(self.version) >= "3.2.3": - tc.variables["SIMDUTF_TESTS"] = False - else: - tc.variables["BUILD_TESTING"] = False + tc.variables["SIMDUTF_TESTS"] = False if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) == "8": tc.variables["CMAKE_CXX_FLAGS"] = " -mavx512f" tc.variables["SIMDUTF_TOOLS"] = False diff --git a/recipes/simdutf/all/patches/2.0.3-0001-fix-cmake.patch b/recipes/simdutf/all/patches/2.0.3-0001-fix-cmake.patch deleted file mode 100644 index 6bedd6c48eb5d..0000000000000 --- a/recipes/simdutf/all/patches/2.0.3-0001-fix-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/simdutf-flags.cmake b/cmake/simdutf-flags.cmake -index 9263a7f..39f5a8c 100644 ---- a/cmake/simdutf-flags.cmake -+++ b/cmake/simdutf-flags.cmake -@@ -16,4 +16,4 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake") - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) --set(CMAKE_MACOSX_RPATH OFF) -+set(CMAKE_MACOSX_RPATH ON) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f3ede1e..91a1bdd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,6 +3,6 @@ target_include_directories(simdutf-include-source INTERFACE $/simdutf.cpp) - target_link_libraries(simdutf-source INTERFACE simdutf-include-source) --add_library(simdutf STATIC simdutf.cpp) -+add_library(simdutf simdutf.cpp) - target_include_directories(simdutf PRIVATE $ ) - target_include_directories(simdutf PUBLIC "$") - diff --git a/recipes/simdutf/all/patches/3.2.14-0001-fix-cmake.patch b/recipes/simdutf/all/patches/3.2.14-0001-fix-cmake.patch deleted file mode 100644 index 2fa471fee1dfb..0000000000000 --- a/recipes/simdutf/all/patches/3.2.14-0001-fix-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/cmake/simdutf-flags.cmake b/cmake/simdutf-flags.cmake -index 4844fa0..801e2b3 100644 ---- a/cmake/simdutf-flags.cmake -+++ b/cmake/simdutf-flags.cmake -@@ -24,4 +24,4 @@ set(SIMDUTF_CXX_STANDARD 11 CACHE STRING "the C++ standard to use for simdutf") - set(CMAKE_CXX_STANDARD ${SIMDUTF_CXX_STANDARD}) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) --set(CMAKE_MACOSX_RPATH OFF) -+set(CMAKE_MACOSX_RPATH ON) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f42e310..80ce35c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,7 +3,7 @@ target_include_directories(simdutf-include-source INTERFACE $/simdutf.cpp) - target_link_libraries(simdutf-source INTERFACE simdutf-include-source) --add_library(simdutf STATIC simdutf.cpp) -+add_library(simdutf simdutf.cpp) - target_include_directories(simdutf PRIVATE $ ) - target_include_directories(simdutf PUBLIC "$") - -@@ -38,4 +38,4 @@ if(SIMDUTF_SANITIZE_UNDEFINED) - endif() - if(MSVC AND BUILD_SHARED_LIBS) - set(SIMDUTF_WINDOWS_DLL TRUE) --endif() -\ No newline at end of file -+endif() diff --git a/recipes/simdutf/config.yml b/recipes/simdutf/config.yml index dc1781664daf2..267f92f069b3f 100644 --- a/recipes/simdutf/config.yml +++ b/recipes/simdutf/config.yml @@ -1,4 +1,6 @@ versions: + "5.2.6": + folder: all "5.2.3": folder: all "5.2.2": @@ -15,17 +17,3 @@ versions: folder: all "3.2.17": folder: all - "3.2.15": - folder: all - "3.2.14": - folder: all - "3.2.2": - folder: all - "3.2.0": - folder: all - "3.1.0": - folder: all - "3.0.0": - folder: all - "2.2.0": - folder: all