[build] Fix cmake syntax

wahello · Sep 10, 2021 · a4342e5 · a4342e5
1 parent 8d7f27d
commit a4342e5
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
@@ -10,7 +10,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 project(openMVG C CXX)
 
 # Run automoc on .hh files in new versions of cmake
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
+if (${CMAKE_VERSION} VERSION_GREATER "3.17" OR
+    ${CMAKE_VERSION} VERSION_EQUAL "3.17")
   cmake_policy(SET CMP0100 NEW)
 endif()
 

diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt
@@ -57,6 +57,6 @@ UNIT_TEST(openMVG sfm_data_BA "openMVG_multiview_test_data;openMVG_sfm;${STLPLUS
 UNIT_TEST(openMVG sfm_data_utils "openMVG_sfm;${STLPLUS_LIBRARY}")
 UNIT_TEST(openMVG sfm_data_filters "openMVG_sfm")
 UNIT_TEST(openMVG sfm_data_graph_utils "openMVG_sfm")
-UNIT_TEST(openMVG sfm_data_triangulation "openMVG_sfm;openMVG_multiview_test_data")
+UNIT_TEST(openMVG sfm_data_triangulation "openMVG_sfm;openMVG_multiview_test_data;${STLPLUS_LIBRARY}")
 
 add_subdirectory(pipelines)