Fix versioning in scn-config.cmake

eliaskosunen · Apr 6, 2024 · 5c4b91e · 5c4b91e
1 parent 97baaf2
commit 5c4b91e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -525,7 +525,7 @@ jobs:
       - name: Build simdutf
         if: matrix.external_deps == 1
         run: |
-          git clone https://github.com/simdutf/simdutf -b v4.0.5 --depth=1
+          git clone https://github.com/simdutf/simdutf -b v5.2.3 --depth=1
           cd simdutf
           mkdir build
           cd build
@@ -536,7 +536,7 @@ jobs:
       - name: Build fast_float
         if: matrix.external_deps == 1
         run: |
-          git clone https://github.com/fastfloat/fast_float -b v6.0.0 --depth=1
+          git clone https://github.com/fastfloat/fast_float -b v6.1.1 --depth=1
           cd fast_float
           mkdir build
           cd build
@@ -655,7 +655,8 @@ jobs:
             icu: OFF
           - engine: Boost
             icu: ON
-          - engine: re2
+          # Disabled due to re2 building trouble
+          #- engine: re2
 
     env:
       CC: gcc-11
@@ -685,15 +686,17 @@ jobs:
       - name: Install re2
         if: matrix.engine == 're2'
         run: |
-          git clone https://github.com/abseil/abseil-cpp -b 20230802.1 --depth=1
+          sudo apt-get remove -y libre2-dev
+          
+          git clone https://github.com/abseil/abseil-cpp -b 20240116.1 --depth=1
           cd abseil-cpp
           mkdir build
           cd build
           cmake -G Ninja -DABSL_BUILD_TESTING=OFF -DABSL_ENABLE_INSTALL=ON ..
           sudo cmake --build . --target install
           cd ../..
           
-          git clone https://github.com/google/re2 -b 2023-11-01 --depth=1
+          git clone https://github.com/google/re2 -b 2024-04-01 --depth=1
           cd re2
           mkdir build
           cd build

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -64,7 +64,7 @@ endif ()
 # we don't want to include tests of dependencies, so we need to do some manual work
 
 if (SCN_USE_EXTERNAL_SIMDUTF)
-    # Can't use the version-flag of `find_package`,
+    # Can't use the single-version-flag of `find_package`,
     # because simdutf only claims compatibility with the same minor version
     # We're compatible with _at least_ v4 and v5
     find_package(simdutf CONFIG REQUIRED)

diff --git a/cmake/scn-config.cmake.in b/cmake/scn-config.cmake.in
@@ -8,10 +8,10 @@ if (UNIX)
 endif ()
 
 if (@SCN_USE_EXTERNAL_SIMDUTF@)
-    find_dependency(simdutf 4.0.0)
+    find_dependency(simdutf)
 endif ()
 if (@SCN_USE_EXTERNAL_FAST_FLOAT@)
-    find_dependency(FastFloat 6.0.0)
+    find_dependency(FastFloat)
 endif ()
 
 if ((@SCN_REGEX_BACKEND@ STREQUAL "Boost") AND @SCN_USE_EXTERNAL_REGEX_BACKEND@)
@@ -23,7 +23,7 @@ if ((@SCN_REGEX_BACKEND@ STREQUAL "Boost") AND @SCN_USE_EXTERNAL_REGEX_BACKEND@)
 endif ()
 
 if ((@SCN_REGEX_BACKEND@ STREQUAL "re2") AND @SCN_USE_EXTERNAL_REGEX_BACKEND@)
-    find_dependency(re2 11.0.0)
+    find_dependency(re2)
 endif ()
 
 check_required_components(scn)