Skip to content

Commit 175934c

Browse files
authored
(#14175) simdutf: add version 2.0.3
1 parent 03d13c9 commit 175934c

File tree

4 files changed

+37
-0
lines changed

4 files changed

+37
-0
lines changed

recipes/simdutf/all/conandata.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
sources:
2+
"2.0.3":
3+
url: "https://github.com/simdutf/simdutf/archive/refs/tags/v2.0.3.tar.gz"
4+
sha256: "076bd07f6fd88c5befba28992cd5a9bf033225c5564d8b88559b8059c3c49cfc"
25
"2.0.2":
36
url: "https://github.com/simdutf/simdutf/archive/refs/tags/v2.0.2.tar.gz"
47
sha256: "ae02a923434c32a9c800e6b136ac039708838ba1f7f6d338175ecb35bf959173"
58
"1.0.1":
69
url: "https://github.com/simdutf/simdutf/archive/refs/tags/v1.0.1.tar.gz"
710
sha256: "e7832ba58fb95fe00de76dbbb2f17d844a7ad02a6f5e3e9e5ce9520e820049a0"
811
patches:
12+
"2.0.3":
13+
- patch_file: "patches/2.0.3-0001-fix-cmake.patch"
14+
patch_description: "remove static build, enable rpath on macOS"
15+
patch_type: "conan"
16+
- patch_file: "patches/2.0.2-0002-add-workaround-gcc9.patch"
17+
patch_description: "apply gcc8 workaround to gcc9"
18+
patch_type: "portability"
919
"2.0.2":
1020
- patch_file: "patches/2.0.2-0001-fix-cmake.patch"
1121
patch_description: "remove static build, stop to link static libc++ and enable rpath on macOS"

recipes/simdutf/all/conanfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ def generate(self):
5959
tc.variables["BUILD_TESTING"] = False
6060
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) == "8":
6161
tc.variables["CMAKE_CXX_FLAGS"] = " -mavx512f"
62+
if Version(self.version) >= "2.0.3":
63+
tc.variables["SIMDUTF_TOOLS"] = False
6264
tc.generate()
6365

6466
deps = CMakeDeps(self)
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/cmake/simdutf-flags.cmake b/cmake/simdutf-flags.cmake
2+
index 9263a7f..39f5a8c 100644
3+
--- a/cmake/simdutf-flags.cmake
4+
+++ b/cmake/simdutf-flags.cmake
5+
@@ -16,4 +16,4 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake")
6+
set(CMAKE_CXX_STANDARD 11)
7+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
8+
set(CMAKE_CXX_EXTENSIONS OFF)
9+
-set(CMAKE_MACOSX_RPATH OFF)
10+
+set(CMAKE_MACOSX_RPATH ON)
11+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
12+
index f3ede1e..91a1bdd 100644
13+
--- a/src/CMakeLists.txt
14+
+++ b/src/CMakeLists.txt
15+
@@ -3,6 +3,6 @@ target_include_directories(simdutf-include-source INTERFACE $<BUILD_INTERFACE:${
16+
add_library(simdutf-source INTERFACE)
17+
target_sources(simdutf-source INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/simdutf.cpp)
18+
target_link_libraries(simdutf-source INTERFACE simdutf-include-source)
19+
-add_library(simdutf STATIC simdutf.cpp)
20+
+add_library(simdutf simdutf.cpp)
21+
target_include_directories(simdutf PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> )
22+
target_include_directories(simdutf PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>")
23+

recipes/simdutf/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"2.0.3":
3+
folder: all
24
"2.0.2":
35
folder: all
46
"1.0.1":

0 commit comments

Comments
 (0)