Update astc-encoder to v3.0-7257cbd-p0 (#426)

Author: rbsheth

cmake/configs/default.cmake

@@ -194,7 +194,7 @@ hunter_default_version(angles VERSION 1.9.11-p0)
 hunter_default_version(apg VERSION 0.0.0-b322f7a-p0)
 hunter_default_version(arabica VERSION 0.0.0-a202766-p0)
 hunter_default_version(asio VERSION 1.17.0-p0)
-hunter_default_version(astc-encoder VERSION 2.0-ab16aaa-p0)
+hunter_default_version(astc-encoder VERSION 3.0-7257cbd-p0)
 hunter_default_version(autobahn-cpp VERSION 0.2.0)
 hunter_default_version(autoutils VERSION 0.3.0)
 hunter_default_version(aws-c-common VERSION 0.5.6)

cmake/projects/astc-encoder/hunter.cmake

@@ -13,49 +13,78 @@ hunter_add_version(
     PACKAGE_NAME
     astc-encoder
     VERSION
-    2.0-ab16aaa-p0
+    1.3-a47b80f-p0
     URL
-    "https://github.com/cpp-pm/astc-encoder/archive/v2.0-ab16aaa-p0.tar.gz"
+    "https://github.com/cpp-pm/astc-encoder/archive/v1.3-a47b80f-p0.tar.gz"
     SHA1
-    027d46d8c190cbfc3c7ab0b78a7773e534f9deec
+    6a181bffbacec7a6c2ee99a0c9bdb9da3de09c95
 )
 
 hunter_add_version(
     PACKAGE_NAME
     astc-encoder
     VERSION
-    1.3-a47b80f-p0
+    1.3-a47b80f-p1
     URL
-    "https://github.com/cpp-pm/astc-encoder/archive/v1.3-a47b80f-p0.tar.gz"
+    "https://github.com/cpp-pm/astc-encoder/archive/v1.3-a47b80f-p1.tar.gz"
     SHA1
-    6a181bffbacec7a6c2ee99a0c9bdb9da3de09c95
+    c01b9663ffd6e6a80cca985d24c4e77fcbaa65e7
 )
 
 hunter_add_version(
     PACKAGE_NAME
     astc-encoder
     VERSION
-    1.3-a47b80f-p1
+    2.0-ab16aaa-p0
     URL
-    "https://github.com/cpp-pm/astc-encoder/archive/v1.3-a47b80f-p1.tar.gz"
+    "https://github.com/cpp-pm/astc-encoder/archive/v2.0-ab16aaa-p0.tar.gz"
     SHA1
-    c01b9663ffd6e6a80cca985d24c4e77fcbaa65e7
+    027d46d8c190cbfc3c7ab0b78a7773e534f9deec
 )
 
-if(ANDROID OR IOS)
-  hunter_cmake_args(
-    astc-encoder
-    CMAKE_ARGS
-      VEC=neon
-      BUILD_APPS=OFF
-  )
-else()
-  hunter_cmake_args(
+hunter_add_version(
+    PACKAGE_NAME
     astc-encoder
-    CMAKE_ARGS
-      VEC=sse2
-      BUILD_APPS=OFF
-  )
+    VERSION
+    3.0-7257cbd-p0
+    URL
+    "https://github.com/cpp-pm/astc-encoder/archive/refs/tags/v3.0-7257cbd-p0.tar.gz"
+    SHA1
+    8cae9efba722ff7effc3f08f2ec86cd5676dee91
+)
+
+if(HUNTER_astc-encoder_VERSION VERSION_LESS 3.0)
+  if(ANDROID OR IOS)
+    hunter_cmake_args(
+      astc-encoder
+      CMAKE_ARGS
+        VEC=neon
+        BUILD_APPS=OFF
+    )
+  else()
+    hunter_cmake_args(
+      astc-encoder
+      CMAKE_ARGS
+        VEC=sse2
+        BUILD_APPS=OFF
+    )
+  endif()
+else() # 3.0 and over
+  if(ANDROID OR IOS)
+    hunter_cmake_args(
+      astc-encoder
+      CMAKE_ARGS
+        ISA_NEON=ON
+        CLI=OFF
+    )
+  else()
+    hunter_cmake_args(
+      astc-encoder
+      CMAKE_ARGS
+        ISA_SSE2=ON
+        CLI=OFF
+    )
+  endif()
 endif()
 
 hunter_pick_scheme(DEFAULT url_sha1_cmake)

examples/astc-encoder/CMakeLists.txt

@@ -11,8 +11,11 @@ project(download-astc-encoder)
 
 # DOCUMENTATION_START {
 hunter_add_package(astc-encoder)
-find_package(astc-encoder CONFIG REQUIRED)
+
+# find_package(astc-encoder CONFIG REQUIRED) # for v1.0-2.0
+find_package(astcencoder CONFIG REQUIRED) # for v3.0+
 
 add_executable(boo boo.cpp)
-target_link_libraries(boo PUBLIC astc-encoder::astcenc)
+# target_link_libraries(boo PUBLIC astc-encoder::astcenc) # for v1.0-v2.0
+target_link_libraries(boo PUBLIC astcencoder::astcenc-static) # for v3.0+
 # DOCUMENTATION_END }

examples/astc-encoder/boo.cpp

@@ -1,4 +1,5 @@
-#include <astc-encoder/astcenc.h>
+// #include <astc-encoder/astcenc.h> // for v1.0-v2.0
+#include <astcenc/astcenc.h> // for v3.0+
 
 int main() {
     astcenc_config my_config; // for v2.0+