replace boost::unittest with oiio::unittest (#170)

* replace boost::unittest with oiio::unittest

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

build_scripts/install_deps_linux.bash

@@ -5,10 +5,6 @@ set -ex
 time sudo apt-get update
 
 time sudo apt-get -q -f install -y \
-    libimath-dev \
-    libboost-dev \
-    libboost-system-dev \
-    libboost-test-dev \
     libceres-dev \
     nlohmann-json3-dev \
     libopencv-dev \

build_scripts/install_deps_mac.bash

@@ -2,4 +2,4 @@
 
 set -ex
 
-brew install ceres-solver imath boost nlohmann-json openimageio
+brew install ceres-solver nlohmann-json openimageio

build_scripts/install_deps_windows.bash

@@ -4,10 +4,5 @@ set -ex
 
 vcpkg install \
     ceres:x64-windows \
-    imath:x64-windows \
-    boost-system:x64-windows \
-    boost-foreach:x64-windows \
-    boost-test:x64-windows \
-    boost-property-tree:x64-windows \
     nlohmann-json:x64-windows \
     openimageio:x64-windows

config/RAWTOACESConfig.cmake.in

@@ -10,7 +10,6 @@ include(CMakeFindDependencyMacro)
 
 find_dependency ( Eigen3 )
 find_dependency ( Ceres )
-find_dependency ( Boost COMPONENTS system )
 find_dependency ( OpenImageIO )
 
 

configure.cmake

@@ -5,12 +5,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake"
 find_package ( nlohmann_json CONFIG REQUIRED )
 find_package ( OpenImageIO   CONFIG REQUIRED )
 find_package ( Eigen3        CONFIG REQUIRED )
-#find_package ( Imath         CONFIG REQUIRED )
-find_package ( Boost         CONFIG REQUIRED
-    COMPONENTS
-        system
-        unit_test_framework
-)
 
 if (RTA_CENTOS7_CERES_HACK)
     find_package ( Ceres MODULE REQUIRED )

src/rawtoaces_core/CMakeLists.txt

@@ -20,10 +20,6 @@ add_library( ${RAWTOACES_CORE_LIB} ${DO_SHARED}
 target_link_libraries(
     ${RAWTOACES_CORE_LIB}
     PUBLIC
-        Boost::boost
-        Boost::system
-        Imath::Imath
-        Imath::ImathConfig
         Eigen3::Eigen
 )
 

src/rawtoaces_util/acesrender.cpp

@@ -309,7 +309,6 @@ bool configure_solver(
 {
     bool success = true;
 
-    
     auto camera_files = collect_data_files( directories, "camera" );
     for ( auto &camera_file: camera_files )
     {

unittest/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
 
-add_definitions (-DBOOST_TEST_DYN_LINK)
-
 ################################################################################
 
 add_executable (
@@ -13,7 +11,7 @@ target_link_libraries(
     Test_SpectralData
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_SpectralData COMMAND Test_SpectralData )
@@ -29,7 +27,7 @@ target_link_libraries(
     Test_IDT
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_IDT COMMAND Test_IDT )
@@ -45,7 +43,7 @@ target_link_libraries(
     Test_Illum
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_Illum COMMAND Test_Illum )
@@ -61,7 +59,6 @@ target_link_libraries(
     Test_DNGIdt
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
         OpenImageIO::OpenImageIO
 )
 
@@ -78,7 +75,7 @@ target_link_libraries(
     Test_Math
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_Math  COMMAND Test_Math )
@@ -94,7 +91,7 @@ target_link_libraries(
     Test_Logic
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_Logic COMMAND Test_Logic )
@@ -110,7 +107,7 @@ target_link_libraries(
     Test_Misc
     PUBLIC
         ${RAWTOACES_CORE_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_Misc COMMAND Test_Misc )
@@ -126,7 +123,7 @@ target_link_libraries(
     Test_UsageTimer
     PUBLIC
         ${RAWTOACES_UTIL_LIB}
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME Test_UsageTimer COMMAND Test_UsageTimer )

unittest/config_tests/CMakeLists.txt

@@ -22,16 +22,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     add_compile_definitions( NOMINMAX )
 endif()
 
-find_package ( Boost REQUIRED
-    COMPONENTS
-        system
-        unit_test_framework
-)
-
 # the Ceres::ceres alias in not getting defined on the config side
-find_package ( Ceres CONFIG REQUIRED )
-
-find_package(RAWTOACES CONFIG REQUIRED)
+find_package ( Ceres       CONFIG REQUIRED )
+find_package ( OpenImageIO CONFIG REQUIRED )
+find_package ( RAWTOACES   CONFIG REQUIRED )
 
 enable_testing()
 add_subdirectory(core)

unittest/config_tests/core/CMakeLists.txt

@@ -12,8 +12,7 @@ target_link_libraries(
     test_core
     PUBLIC
         rawtoaces_core
-        Boost::boost
-        Boost::unit_test_framework
+        OpenImageIO::OpenImageIO
 )
 
 add_test ( NAME test_core COMMAND test_core )