fix for test

- new opencv-em version 0.1.3
webarkit · Oct 25, 2023 · 794e269 · 794e269
1 parent 85e8497
commit 794e269
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/WebARKit/CMakeLists.txt b/WebARKit/CMakeLists.txt
@@ -14,13 +14,13 @@ if(${EMSCRIPTEN_COMP} EQUAL 1)
   message("Fetching opencv for emscripten compilation from webarkit/opencv-em ...")
   FetchContent_Declare(
     build_opencv
-    URL https://github.com/webarkit/opencv-em/releases/download/0.1.0/opencv-js-4.7.0-emcc-3.1.26.zip
+    URL https://github.com/webarkit/opencv-em/releases/download/0.1.3/opencv-js-4.7.0-emcc-3.1.26.zip
   )
 else()
   message("Fetching opencv from webarkit/opencv-em ...")
   FetchContent_Declare(
     build_opencv
-    URL https://github.com/webarkit/opencv-em/releases/download/0.1.0/opencv-4.7.0.zip
+    URL https://github.com/webarkit/opencv-em/releases/download/0.1.3/opencv-4.7.0.zip
   )
 endif()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.22)
 project(Webarkit_tests)
 
 # GoogleTest requires at least C++14
@@ -19,9 +19,16 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 FetchContent_Declare(
   build_opencv
-  URL https://github.com/webarkit/opencv-em/releases/download/0.1.1/opencv-4.7.0.zip
+  URL https://github.com/webarkit/opencv-em/releases/download/0.1.3/opencv-4.7.0.zip
 )
 
+
+#[[FetchContent_Declare(
+  build_opencv
+  URL /home/kalwalt/kalwalt-github/opencv-em/packaging/opencv-4.7.0.zip
+)
+]]#
+
 FetchContent_MakeAvailable(googletest build_opencv)
 
 enable_testing()
@@ -40,6 +47,7 @@ target_include_directories(webarkit_test PRIVATE "${PARENT_DIR}/WebARKit/WebARKi
 
 target_include_directories(webarkit_test PRIVATE
         "${build_opencv_SOURCE_DIR}"
+        "${build_opencv_SOURCE_DIR}/3rdparty/include/libjpeg"
         "${build_opencv_SOURCE_DIR}/libs/opencv/include"
         "${build_opencv_SOURCE_DIR}/libs/opencv/modules/calib3d/include"
         "${build_opencv_SOURCE_DIR}/libs/opencv/modules/core/include"