Merge branch 'develop' into develop_modernize_openmp_usage

wahello · Dec 8, 2021 · a78b941 · a78b941
2 parents 999d729 + 292568e
commit a78b941
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -238,15 +238,14 @@ ENDMACRO(UNIT_TEST)
 # - internal if cereal not found
 # ==============================================================================
 find_package(cereal QUIET CONFIG)
-if (NOT TARGET cereal)
+if (NOT cereal_FOUND)
   add_library(cereal INTERFACE)
   target_include_directories(cereal
     INTERFACE
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cereal/include>
       $<INSTALL_INTERFACE:include/openMVG_dependencies/cereal/include>
   )
   install(TARGETS cereal EXPORT openMVG-targets)
-
   set(OpenMVG_USE_INTERNAL_CEREAL ON)
 endif()
 

diff --git a/src/openMVG/matching/metric_simd.hpp b/src/openMVG/matching/metric_simd.hpp
@@ -17,7 +17,9 @@
 #include <numeric>
 
 #include <cstdint>
+#if defined(OPENMVG_USE_AVX2) || defined(OPENMVG_USE_AVX)
 #include <immintrin.h>
+#endif
 
 namespace openMVG {
 namespace matching {