CAP-FIX: solved dlls cleaning/copying + basic tests structure

Author: 9and3

CMakeLists.txt

@@ -7,6 +7,12 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(external_tools)
 include(options)
 
+# check that the -DCMAKE_BUILD_TYPE is set
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "Setting build type to 'Release' as none was specified.")
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
+endif()
+
 # do a submodule init if not done already
 execute_process(COMMAND git submodule update --init --recursive
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -48,7 +54,7 @@ target_include_directories(${SHARED_LIB_NAME}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-    #set the MD_DynamicRelease flag for MSVC since we are compiling with /MD for py wrap
+#set the MD_DynamicRelease flag for MSVC since we are compiling with /MD for py wrap
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 
 
@@ -146,31 +152,20 @@ if (BUILD_PYTHON_MODULE)
         $<TARGET_FILE:${PYBINDMODULE_NAME}>
         ${PYPI_DIR}
         )
-
-    # get all the files -dlls in the bin directory and copy them one by one to the pypi directory
-    file(GLOB files ${CMAKE_BINARY_DIR}/bin/Release/*.dll)
-    foreach(file ${files})
-        message(STATUS "Copying ${file} to ${TARGET_DLL_PYPI_DIR}")
-        add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-            ${file}
-            ${TARGET_DLL_PYPI_DIR}
-            )
-    endforeach()
+    copy_dlls(${TARGET_DLL_PYPI_DIR} ${PYBINDMODULE_NAME})
 
 endif()
 
 #--------------------------------------------------------------------------
 # Tests
 #--------------------------------------------------------------------------
-
 include(CTest)
 enable_testing()
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/googletest)
 set(TESTS_OUT_DIR ${CMAKE_BINARY_DIR}/df_tests/)
+set(TEST_OUT_DIR_BINARY ${TESTS_OUT_DIR}/${CMAKE_BUILD_TYPE})
 
-
-# Unit testing ------------------------------------------------------------
+# add new test suites .cc here
 set(UNIT_TESTS df_test_suites)
 add_executable(${UNIT_TESTS}
     tests/unit_tests/DFPointCloudTest.cc
@@ -179,40 +174,8 @@ add_executable(${UNIT_TESTS}
 set_target_properties(${UNIT_TESTS} PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${TESTS_OUT_DIR}
     )
-
 target_link_libraries(${UNIT_TESTS} gtest gtest_main)
 target_link_libraries(${UNIT_TESTS} ${SHARED_LIB_NAME})
 
 add_test(NAME ${UNIT_TESTS} COMMAND ${UNIT_TESTS})
-
-
-
-
-
-
-
-# # post build recipe
-# add_test(NAME ${UNIT_TEST} COMMAND ${UNIT_TEST})
-# add_custom_command(
-#      TARGET ${UNIT_TEST}
-#      COMMENT "Run tests"
-#      POST_BUILD 
-#      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-#      COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -R "^${UNIT_TEST}$" --output-on-failures
-# )
-
-# Integration testing -----------------------------------------------------
-# Component testing -------------------------------------------------------
-# etc ---------------------------------------------------------------------
-
-# # TODO: a better way to copy the dlls to the tests directory for the tests
-# # get all the files -dlls in the bin directory and copy them one by one to tests dir
-# file(GLOB files ${CMAKE_BINARY_DIR}/bin/Release/*.dll)
-# foreach(file ${files})
-#     message(STATUS "Copying ${file} to ${TESTS_OUT_DIR}")
-#     add_custom_command(TARGET ${UNIT_TESTS} POST_BUILD
-#         COMMAND ${CMAKE_COMMAND} -E copy
-#         ${file}
-#         ${TESTS_OUT_DIR}/Release
-#         )
-# endforeach()
+copy_dlls(${TEST_OUT_DIR_BINARY} ${UNIT_TESTS})

cmake/__noenv__config.bat

@@ -1,2 +1,2 @@
 REM configure the project
-cmake -S . -B build
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release

cmake/clean_config.bat

@@ -5,4 +5,4 @@ REM clean the build directory and reconfigure it
 rmdir /s /q build
 
 REM configure the project
-cmake -S . -B build
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release

cmake/config.bat

@@ -2,4 +2,4 @@ REM activate the conda diff_check environment otherwise the python wrap won't wo
 call cmake/activate_conda.bat
 
 REM configure the project
-cmake -S . -B build
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release

cmake/external_tools.cmake

@@ -228,4 +228,23 @@ function(download_submodule_project project_name)
   if(NOT GIT_SUBMOD_RESULT EQUAL "0")
     message(FATAL_ERROR "git submodule update --init --recursive --remote failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
   endif()
+endfunction()
+
+# ------------------------------------------------------------------------------
+function (copy_dlls directory_to_copy_dlls post_build_target)
+  message (STATUS "Erasing old DLLs and copy new ones to ${directory_to_copy_dlls}")
+  file(GLOB files ${directory_to_copy_dlls}/*.dll)
+  foreach(file ${files})
+      message(STATUS "Removing ${file}")
+      file(REMOVE ${file})
+  endforeach()
+  file(GLOB files ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/*.dll)
+  foreach(file ${files})
+      message(STATUS "Copying ${file} to ${directory_to_copy_dlls}")
+      add_custom_command(TARGET ${post_build_target} POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy
+          ${file}
+          ${directory_to_copy_dlls}
+          )
+  endforeach()
 endfunction()

src/diffCheckApp.cc

@@ -12,39 +12,39 @@ int main()
   std::shared_ptr<diffCheck::geometry::DFMesh> dfMeshPtr 
       = std::make_shared<diffCheck::geometry::DFMesh>();
 
-  // create a sphere from o3d
-  std::string pathCloud = R"(C:\andre\Downloads\moved_04.ply)";
-  std::string pathMesh = R"(C:\Users\andre\Downloads\meshtest.ply)";
+  // // create a sphere from o3d
+  // std::string pathCloud = R"(C:\andre\Downloads\moved_04.ply)";
+  // std::string pathMesh = R"(C:\Users\andre\Downloads\meshtest.ply)";
 
-  // dfPointCloudPtr->LoadFromPLY(pathCloud);
-  dfMeshPtr->LoadFromPLY(pathMesh);
+  // // dfPointCloudPtr->LoadFromPLY(pathCloud);
+  // dfMeshPtr->LoadFromPLY(pathMesh);
 
-  open3d::geometry::TriangleMesh meshO3d = *dfMeshPtr->Cvt2O3DTriangleMesh();
+  // open3d::geometry::TriangleMesh meshO3d = *dfMeshPtr->Cvt2O3DTriangleMesh();
 
 
-  // convert the sphere to a diffCheck point cloud
-  // auto o3dPointCloud = meshO3d.SamplePointsUniformly(1000);
+  // // convert the sphere to a diffCheck point cloud
+  // // auto o3dPointCloud = meshO3d.SamplePointsUniformly(1000);
 
-  std::shared_ptr<open3d::geometry::PointCloud> tightBBOX = std::make_shared<open3d::geometry::PointCloud>();
+  // std::shared_ptr<open3d::geometry::PointCloud> tightBBOX = std::make_shared<open3d::geometry::PointCloud>();
 
-  // compute the bounding box
-  open3d::geometry::OrientedBoundingBox bbox = meshO3d.GetMinimalOrientedBoundingBox();
-  std::vector<Eigen::Vector3d> bboxPts = bbox.GetBoxPoints();
-  for (auto &pt : bboxPts)
-  {
-    tightBBOX->points_.push_back(pt);
-  }
+  // // compute the bounding box
+  // open3d::geometry::OrientedBoundingBox bbox = meshO3d.GetMinimalOrientedBoundingBox();
+  // std::vector<Eigen::Vector3d> bboxPts = bbox.GetBoxPoints();
+  // for (auto &pt : bboxPts)
+  // {
+  //   tightBBOX->points_.push_back(pt);
+  // }
 
 
-  dfPointCloudPtr->Cvt2DFPointCloud(tightBBOX);
+  // dfPointCloudPtr->Cvt2DFPointCloud(tightBBOX);
 
 
 
 
-  std::shared_ptr<diffCheck::visualizer::Visualizer> vis = std::make_shared<diffCheck::visualizer::Visualizer>();
-  vis->AddPointCloud(dfPointCloudPtr);
-  // vis->AddMesh(dfMeshPtr);
-  vis->Run();
+  // std::shared_ptr<diffCheck::visualizer::Visualizer> vis = std::make_shared<diffCheck::visualizer::Visualizer>();
+  // vis->AddPointCloud(dfPointCloudPtr);
+  // // vis->AddMesh(dfMeshPtr);
+  // vis->Run();
 
 
   return 0;