Merge pull request #773 from alicevision/fix/unittest

Fix unit test includes
alicevision · Apr 27, 2020 · 979d640 · 979d640
2 parents ce27c4a + e4e9efa
commit 979d640
Show file tree

Hide file tree

Showing 80 changed files with 261 additions and 167 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,8 +19,6 @@ option(AV_BUILD_ALICEVISION "Enable building of AliceVision" ON)
 
 option(AV_USE_CUDA "Enable CUDA" ON)
 
-option(INSTALL_DEPS_BUILD "Install all files from dependencies (it only makes sense if ALICEVISION_BUILD_DEPENDENCIES=ON)" OFF)
-
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type for AliceVision" FORCE)
 endif()
@@ -92,8 +90,7 @@ include(ExternalProject)
 
 set(BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/external")
 
-set(CMAKE_CORE_BUILD_FLAGS -DCMAKE_BUILD_TYPE=${DEPS_CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_DO_STRIP=${CMAKE_INSTALL_DO_STRIP})
-set(CMAKE_CORE_BUILD_FLAGS_NOSHARED -DCMAKE_BUILD_TYPE=${DEPS_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_DO_STRIP=${CMAKE_INSTALL_DO_STRIP})
+set(CMAKE_CORE_BUILD_FLAGS -DCMAKE_BUILD_TYPE=${DEPS_CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DCMAKE_INSTALL_DO_STRIP:BOOL=${CMAKE_INSTALL_DO_STRIP} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 
 if(AV_BUILD_ZLIB)
 set(ZLIB_TARGET zlib)
@@ -297,7 +294,7 @@ ExternalProject_Add(${OPENEXR_TARGET}
       CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DOPENEXR_BUILD_PYTHON_LIBS=OFF -DOPENEXR_ENABLE_TESTS=OFF ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> <SOURCE_DIR>
       DEPENDS ${ZLIB_TARGET}
       )
-set(ILMBASE_CMAKE_FLAGS -DILMBASE_ROOT=${CMAKE_INSTALL_PREFIX} -DILMBASE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include)
+set(ILMBASE_CMAKE_FLAGS -DILMBASE_ROOT=${CMAKE_INSTALL_PREFIX} -DILMBASE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include/OpenEXR)
 set(OPENEXR_CMAKE_FLAGS ${ILMBASE_CMAKE_FLAGS} -DOPENEXR_ROOT=${CMAKE_INSTALL_PREFIX} -DOPENEXR_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include)
 
 # Add LibTiff
@@ -435,7 +432,7 @@ ExternalProject_Add(${OPENIMAGEIO_TARGET}
       )
 # TODO: openjpeg
 # -DOPENJPEG_INCLUDE_DIR=$OPENJPEG_INCLUDE_DIR/openjpeg-2.0 -DOPENJPEG_OPENJP2_LIBRARIES=$OPENJPEG_OPENJP2_LIBRARIES
-set(OPENIMAGEIO_CMAKE_FLAGS -DOPENIMAGEIO_LIBRARY_DIR_HINTS=${CMAKE_INSTALL_PREFIX} -DOPENIMAGEIO_INCLUDE_DIR_HINTS=${CMAKE_INSTALL_PREFIX})
+set(OPENIMAGEIO_CMAKE_FLAGS -DOpenImageIO_DIR=${CMAKE_INSTALL_PREFIX})
 
 # Add Alembic: I/O for Point Cloud and Cameras
 set(ALEMBIC_TARGET alembic)
@@ -468,7 +465,7 @@ ExternalProject_Add(opencv_contrib
   INSTALL_COMMAND ""
 )
 ExternalProject_Add(${OPENCV_TARGET}
-  DEPENDS opencv_contrib ${TBB_TARGET} ${ZLIB_TARGET}
+  DEPENDS opencv_contrib ${TBB_TARGET} ${ZLIB_TARGET} ${OPENEXR_TARGET} ${TIFF_TARGET} ${PNG_TARGET} ${JPEG_TARGET} ${LIBRAW_TARGET}
   # URL https://github.com/opencv/opencv/archive/4.2.0.zip
   # URL_MD5 b02b54115f1f99cb9e885d1e5988ff70
   URL https://github.com/opencv/opencv/archive/4.1.0.zip
@@ -481,8 +478,8 @@ ExternalProject_Add(${OPENCV_TARGET}
   INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
   CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
     -DOPENCV_EXTRA_MODULES_PATH=${CMAKE_CURRENT_BINARY_DIR}/opencv_contrib/modules
-    ${ZLIB_CMAKE_FLAGS}
-    ${TBB_CMAKE_FLAGS}
+    ${ZLIB_CMAKE_FLAGS} ${TBB_CMAKE_FLAGS}
+    ${TIFF_CMAKE_FLAGS} ${PNG_CMAKE_FLAGS} ${JPEG_CMAKE_FLAGS} ${LIBRAW_CMAKE_FLAGS}
     -DWITH_TBB=ON
     -DBUILD_opencv_python2=OFF
     -DBUILD_opencv_python3=OFF
@@ -494,6 +491,7 @@ ExternalProject_Add(${OPENCV_TARGET}
     -DWITH_QT=OFF
     -DWITH_OPENGL=OFF
     -DWITH_VTK=OFF
+    -DWITH_OPENEXR=OFF  # Build error on IlmBase includes without "OpenEXR/" prefix
     -DENABLE_PRECOMPILED_HEADERS=OFF
     -DBUILD_SHARED_LIBS=ON
     -DWITH_CUDA=OFF
@@ -575,7 +573,7 @@ ExternalProject_Add(aliceVision
        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src
        BINARY_DIR ${BUILD_DIR}/aliceVision_build
        INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-       CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=ON -DTARGET_ARCHITECTURE=core -DALICEVISION_ROOT=${ALICEVISION_ROOT} -DALICEVISION_USE_ALEMBIC=ON -DMINIGLOG=ON -DALICEVISION_USE_CCTAG=${AV_BUILD_CCTAG} -DALICEVISION_USE_OPENCV=${AV_BUILD_OPENCV} -DALICEVISION_USE_OPENGV=${AV_BUILD_OPENGV} -DALICEVISION_USE_POPSIFT=${AV_BUILD_POPSIFT} -DALICEVISION_USE_CUDA=${AV_USE_CUDA} -DALICEVISION_BUILD_DOC=OFF -DALICEVISION_BUILD_EXAMPLES=OFF ${ZLIB_CMAKE_FLAGS} ${EIGEN_CMAKE_FLAGS} ${OPENIMAGEIO_CMAKE_FLAGS} ${OPENEXR_CMAKE_FLAGS} ${BOOST_CMAKE_FLAGS} ${ALEMBIC_CMAKE_FLAGS} ${GEOGRAM_CMAKE_FLAGS} ${LAPACK_CMAKE_FLAGS} ${CERES_CMAKE_FLAGS} ${CUDA_CMAKE_FLAGS} ${POPSIFT_CMAKE_FLAGS} ${OPENGV_CMAKE_FLAGS} ${OPENCV_CMAKE_FLAGS} ${CCTAG_CMAKE_FLAGS} -DALICEVISION_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+       CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=ON -DTARGET_ARCHITECTURE=core -DALICEVISION_ROOT=${ALICEVISION_ROOT} -DALICEVISION_USE_ALEMBIC=ON -DMINIGLOG=ON -DALICEVISION_USE_CCTAG=${AV_BUILD_CCTAG} -DALICEVISION_USE_OPENCV=${AV_BUILD_OPENCV} -DALICEVISION_USE_OPENGV=${AV_BUILD_OPENGV} -DALICEVISION_USE_POPSIFT=${AV_BUILD_POPSIFT} -DALICEVISION_USE_CUDA=${AV_USE_CUDA} -DALICEVISION_BUILD_DOC=OFF -DALICEVISION_BUILD_EXAMPLES=OFF ${ZLIB_CMAKE_FLAGS} ${EIGEN_CMAKE_FLAGS} ${OPENIMAGEIO_CMAKE_FLAGS} ${OPENEXR_CMAKE_FLAGS} ${BOOST_CMAKE_FLAGS} ${ALEMBIC_CMAKE_FLAGS} ${GEOGRAM_CMAKE_FLAGS} ${LAPACK_CMAKE_FLAGS} ${CERES_CMAKE_FLAGS} ${CUDA_CMAKE_FLAGS} ${POPSIFT_CMAKE_FLAGS} ${OPENGV_CMAKE_FLAGS} ${OPENCV_CMAKE_FLAGS} ${CCTAG_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
        DEPENDS ${AV_DEPS}
        )
 endif()

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ ENV AV_DEV=/opt/AliceVision_git \
 COPY . "${AV_DEV}"
 
 WORKDIR "${AV_BUILD}"
-RUN cmake -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_SHARED=ON -DBUILD_SHARED_LIBS:BOOL=ON -DTARGET_ARCHITECTURE=core \
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=ON -DTARGET_ARCHITECTURE=core \
       -DALICEVISION_BUILD_DEPENDENCIES:BOOL=OFF \
       -DCMAKE_PREFIX_PATH:PATH="${AV_INSTALL}" \
       -DCMAKE_INSTALL_PREFIX:PATH="${AV_INSTALL}" -DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}" \

diff --git a/Dockerfile_deps b/Dockerfile_deps
@@ -63,7 +63,7 @@ RUN wget https://gitlab.com/alicevision/trainedVocabularyTreeData/raw/master/vlf
 COPY . "${AV_DEV}"
 
 WORKDIR "${AV_BUILD}"
-RUN cmake "${AV_DEV}" -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_DEPENDENCIES:BOOL=ON -DINSTALL_DEPS_BUILD:BOOL=ON -DAV_BUILD_ALICEVISION:BOOL=OFF -DCMAKE_INSTALL_PREFIX="${AV_INSTALL}" -DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}"
+RUN cmake "${AV_DEV}" -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_DEPENDENCIES:BOOL=ON -DAV_BUILD_ALICEVISION:BOOL=OFF -DCMAKE_INSTALL_PREFIX="${AV_INSTALL}" -DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}"
 
 WORKDIR "${AV_BUILD}"
 # RUN make zlib

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,7 +47,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # ==============================================================================
 # AliceVision build options
 # ==============================================================================
-option(ALICEVISION_BUILD_SHARED "Build AliceVision shared libs" ON)
 option(ALICEVISION_BUILD_SFM "Build AliceVision SfM part" ON)
 option(ALICEVISION_BUILD_MVS "Build AliceVision MVS part" ON)
 option(ALICEVISION_BUILD_HDR "Build AliceVision HDR part" ON)
@@ -72,18 +71,33 @@ option(ALICEVISION_REQUIRE_CERES_WITH_SUITESPARSE "Require Ceres with SuiteSpars
 
 option(ALICEVISION_USE_RPATH "Add RPATH on software with relative paths to libraries" ON)
 
+option(ALICEVISION_BUILD_TESTS "Build AliceVision tests" OFF)
+
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+
 # Default build is in Release mode
 if(NOT CMAKE_BUILD_TYPE AND NOT MSVC)
   set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+# ==============================================================================
+# Enable cmake UNIT TEST framework
+# ==============================================================================
+if(ALICEVISION_BUILD_TESTS AND NOT CMAKE_TESTING_ENABLED)
+  enable_testing()
+endif()
+
 # ==============================================================================
 # GNUInstallDirs CMake module
 # - Define GNU standard installation directories
 # - Provides install directory variables as defined by the GNU Coding Standards.
 # ==============================================================================
 include(GNUInstallDirs)
 
+if(CMAKE_BUILD_TYPE MATCHES Release)
+    message(STATUS "Force CMAKE_INSTALL_DO_STRIP in Release")
+    set(CMAKE_INSTALL_DO_STRIP TRUE)
+endif()
 
 if(ALICEVISION_USE_RPATH)
   if(APPLE)
@@ -125,15 +139,11 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.10)
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compatibilityCUDA)
 endif()
 
-# Set shared or static mode
-if(ALICEVISION_BUILD_SHARED)
-  set(BUILD_SHARED_LIBS ON)
+if(BUILD_SHARED_LIBS)
   if(WIN32)
     # Export all symbols from the dynamic libraries by default (avoid dllexport markup)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
   endif()
-elseif()
-  set(BUILD_SHARED_LIBS OFF)
 endif()
 
 # ==============================================================================
@@ -264,9 +274,13 @@ endif()
 # Disable BOOST autolink
 add_definitions(-DBOOST_ALL_NO_LIB)
 
-# Force BOOST to use dynamic libraries (avoid link error with boost program_options)
-# https://lists.boost.org/boost-users/2009/11/54015.php
-add_definitions(-DBOOST_ALL_DYN_LINK)
+if(BUILD_SHARED_LIBS)
+  # Force BOOST to use dynamic libraries (avoid link error with boost program_options)
+  # https://lists.boost.org/boost-users/2009/11/54015.php
+  add_definitions(-DBOOST_ALL_DYN_LINK)
+else()
+  set(Boost_USE_STATIC_LIBS ON)
+endif()
 
 if(BOOST_NO_CXX11)
   # Avoid link errors on boost filesystem copy_file function
@@ -289,7 +303,7 @@ endif()
 # OpenImageIO
 # ==============================================================================
 find_package(OpenImageIO 1.8 REQUIRED)
-if(OPENIMAGEIO_FOUND)
+if(OPENIMAGEIO_FOUND OR OpenImageIO_FOUND)
   message(STATUS "OpenImageIO found.")
   if(UNIX)
     # Add DL dependency on linux
@@ -885,7 +899,7 @@ endif()
 # ==============================================================================
 message("\n")
 message("** AliceVision version: " ${ALICEVISION_VERSION})
-message("** Build Shared libs: " ${ALICEVISION_BUILD_SHARED})
+message("** Build Shared libs: " ${BUILD_SHARED_LIBS})
 message("** Build SfM part: " ${ALICEVISION_BUILD_SFM})
 message("** Build MVS part: " ${ALICEVISION_BUILD_MVS})
 message("** Build AliceVision tests: " ${ALICEVISION_BUILD_TESTS})

diff --git a/src/aliceVision/camera/pinholeBrown_test.cpp b/src/aliceVision/camera/pinholeBrown_test.cpp
@@ -8,8 +8,9 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeBrown
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/camera/pinholeFisheye1_test.cpp b/src/aliceVision/camera/pinholeFisheye1_test.cpp
@@ -7,8 +7,9 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeFisheye1
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/camera/pinholeFisheye_test.cpp b/src/aliceVision/camera/pinholeFisheye_test.cpp
@@ -8,8 +8,9 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeFisheye
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/camera/pinholeRadial_test.cpp b/src/aliceVision/camera/pinholeRadial_test.cpp
@@ -8,8 +8,9 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeRadial
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp b/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp
@@ -20,8 +20,9 @@
 #include "dependencies/htmlDoc/htmlDoc.hpp"
 
 #define BOOST_TEST_MODULE GainOffsetConstraintBuilder
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::linearProgramming;

diff --git a/src/aliceVision/feature/features_test.cpp b/src/aliceVision/feature/features_test.cpp
@@ -13,8 +13,9 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE Feature
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace std;
 using std::string;

diff --git a/src/aliceVision/geometry/frustumIntersection_test.cpp b/src/aliceVision/geometry/frustumIntersection_test.cpp
@@ -14,8 +14,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE frustumIntersection
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::geometry;

diff --git a/src/aliceVision/geometry/halfSpaceIntersection_test.cpp b/src/aliceVision/geometry/halfSpaceIntersection_test.cpp
@@ -11,8 +11,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE halfSpaceIntersection
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::geometry::halfPlane;

diff --git a/src/aliceVision/geometry/rigidTransformation3D_test.cpp b/src/aliceVision/geometry/rigidTransformation3D_test.cpp
@@ -11,8 +11,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE rigidTransformation3D
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::geometry;

diff --git a/src/aliceVision/graph/connectedComponent_test.cpp b/src/aliceVision/graph/connectedComponent_test.cpp
@@ -11,8 +11,9 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE connectedComponent
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace lemon;
 

diff --git a/src/aliceVision/graph/triplet_test.cpp b/src/aliceVision/graph/triplet_test.cpp
@@ -11,8 +11,9 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE tripletFinder
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision::graph;
 

diff --git a/src/aliceVision/image/drawing_test.cpp b/src/aliceVision/image/drawing_test.cpp
@@ -8,8 +8,9 @@
 #include "aliceVision/image/all.hpp"
 
 #define BOOST_TEST_MODULE ImageDrawing
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::image;

diff --git a/src/aliceVision/image/filtering_test.cpp b/src/aliceVision/image/filtering_test.cpp
@@ -10,8 +10,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE ImageFiltering
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::image;

diff --git a/src/aliceVision/image/image_test.cpp b/src/aliceVision/image/image_test.cpp
@@ -10,8 +10,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE Image
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace std;
 using namespace aliceVision;

diff --git a/src/aliceVision/image/io_test.cpp b/src/aliceVision/image/io_test.cpp
@@ -9,8 +9,9 @@
 #include "aliceVision/image/all.hpp"
 
 #define BOOST_TEST_MODULE imageIO
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <cstdio>
 #include <iostream>

diff --git a/src/aliceVision/image/resampling_test.cpp b/src/aliceVision/image/resampling_test.cpp
@@ -12,8 +12,9 @@
 #include <sstream>
 
 #define BOOST_TEST_MODULE ImageRessampling
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::image;

diff --git a/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp b/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp
@@ -11,8 +11,9 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE LIGHTING_ESTIMATION
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <aliceVision/unitTest.hpp>