Merge pull request #5 from diffCheckOrg/refactor_cmakeproj

Better CMake project for DiffCheck + CI fix

Author: 9and3

.github/workflows/win-build.yml

@@ -20,8 +20,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: CMAKE Configure
-        run: >
-          cmake -B ${{github.workspace}}/build -S ${{github.workspace}} 
-          -D CMAKE_BUILD_TYPE=Release
+        run: ${{github.workspace}}/cmake/config.bat
       - name: CMake Build
-        run: cmake --build ${{github.workspace}}/build --config Release
+        run: ${{github.workspace}}/cmake/build.bat

.gitmodules

@@ -4,4 +4,10 @@
 	branch = main
 [submodule "deps/eigen"]
 	path = deps/eigen
-	url = https://gitlab.com/libeigen/eigen.git
+	url = https://gitlab.com/libeigen/eigen.git
+[submodule "deps/open3d"]
+	path = deps/open3d
+	url = https://github.com/diffCheckOrg/submodule-open3d.git
+[submodule "deps/boost"]
+	path = deps/boost
+	url = https://github.com/diffCheckOrg/submodule-boost.git

CMakeLists.txt

@@ -52,7 +52,7 @@ download_submodule_project(eigen)
 add_subdirectory(deps/eigen)
 target_link_libraries(${SHARED_LIB_NAME} PUBLIC Eigen3::Eigen)
 
-# Open3D (from system) -----------------------------------------------------    
+# Open3D (pre-built binaries) -----------------------------------------------------    
 # The options need to be the same as Open3D's default
 # If Open3D is configured and built with custom options, you'll also need to
 # specify the same custom options.
@@ -63,6 +63,8 @@ else()
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
 
+download_submodule_project(open3d)
+set(Open3D_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/0_18/CMake)
 find_package(Open3D 0.18.0 REQUIRED)
 
 # print the version debug or release of the package
@@ -85,9 +87,9 @@ if(WIN32)
     endif()
 endif()
 
-# Boost (from system) -----------------------------------------------------
-# download and install from https://sourceforge.net/projects/boost/files/boost-binaries/1.84.0/boost_1_84_0-msvc-14.3-64.exe/download
-find_package(Boost REQUIRED)
+# Boost (header only) -----------------------------------------------------
+download_submodule_project(boost)
+target_link_directories(${SHARED_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/boost/win/1_89/include/boost-1_85)
 
 # print boost include dir
 message(STATUS "Boost include dir: ${Boost_INCLUDE_DIRS}")

README.md

@@ -47,24 +47,10 @@ gantt
 ## 3rd party libraries
 
 The project uses the following 3rd party libraries:
-- `Open3d 0.18.0` for 3D point cloud processing it needs to be installed from source [from here](https://github.com/isl-org/Open3D/archive/refs/tags/v0.18.0.zip), unzip the file and by following the instructions below:
-```terminal
-cd open3d
-mkdir build
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="C:\Program Files\Open3D" -S . -B build
-cmake --build build --config Release --target ALL_BUILD
-cmake --build build --config Release --target INSTALL
-```
-- `Eigen` for linear algebra (needed by `Open3d`)
+- `Open3d 0.18.0` for 3D point cloud processing as pre-build binaries ([store here](https://github.com/diffCheckOrg/submodule-open3d.git))
+- `Eigen` for linear algebra
 - `CGAL` for general geometric processing and IO
-- `Boost` for general utilities, it needs to be installed from source [from the repo](https://github.com/boostorg/boost) as such:
-```terminal
-git clone --recursive https://github.com/boostorg/boost.git
-cd boost
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="C:\Program Files\Boost" -S . -B build
-cmake --build build --config Release --target ALL_BUILD
-cmake --build build --config Release --target INSTALL
-```
+- `Boost` for general utilities as pre-build binaries ([store here](https://github.com/diffCheckOrg/submodule-boost.git))
 
 ## How to build c++ project
 To build and test the project, follow the following steps:

cmake/Dockerfile

@@ -1 +1 @@
-cmake -S . -B build -G "Visual Studio 16 2019" -A x64
+cmake -S . -B build

cmake/config.bat

@@ -1,8 +1,6 @@
 #pragma once
 
 
-// include CGAL 
-
 #include <open3d/Open3D.h>
 
 // diffCheck includes