cleanup

.github/workflows/bots.yml

@@ -0,0 +1,45 @@
+name: c++/cmake
+
+on:
+   push:
+     branches: [ main ]
+   pull_request:
+     branches: [ main ]
+
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: macos
+      if: matrix.os == 'macOS-latest' 
+      run: brew install libomp eigen
+ 
+    - name: linux
+      if: matrix.os == 'ubuntu-latest' 
+      run: sudo apt-get install libeigen3-dev
+ 
+ 
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cd examples/main ; cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run:  cd examples/main ;  cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+

3-modeling/c++/CMakeLists.txt

@@ -1,70 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-project(CGDI)
-
-
-# Print the build type
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release" FORCE)
-endif()
-message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
-
-### Configure the compiler
-# This is a basic, decent setup that should do something sane on most compilers
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-
-  # using Clang (linux or apple) or GCC
-  message("Using clang/gcc compiler flags")
-  SET(BASE_CXX_FLAGS "-std=c++11 -Wall -Wextra")
-  SET(DISABLED_WARNINGS " -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations -Wno-missing-braces -Wno-unused-private-field")
-  SET(TRACE_INCLUDES " -H -Wno-error=unused-command-line-argument")
-
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    message("Setting clang-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -ferror-limit=3 -fcolor-diagnostics")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -fsanitize=address -fno-limit-debug-info")
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    message("Setting gcc-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -fmax-errors=5")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3")
-    SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-maybe-uninitialized -Wno-format-zero-length -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-  endif()
-
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS_RELEASE        "-O3  -DNDEBUG")
-
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  # using Visual Studio C++
-  message("Using Visual Studio compiler flags")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /W4")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /MP") # parallel build
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4267\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4244\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4305\"")  # ignore truncation on initialization
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-
-  add_definitions(/D "_CRT_SECURE_NO_WARNINGS")
-  add_definitions(-DNOMINMAX)
-  add_definitions(-D_USE_MATH_DEFINES)
-else()
-  # unrecognized
-  message( FATAL_ERROR "Unrecognized compiler [${CMAKE_CXX_COMPILER_ID}]" )
-endif()
-
-
-# == Deps
-add_subdirectory(deps/geometry-central)
-add_subdirectory(deps/polyscope)
-
-# == Build our project stuff
-
-
-
-add_executable(simpleTest simpleTest)
-target_link_libraries(simpleTest polyscope)
-
-add_executable(displayOBJ displayOBJ)
-target_link_libraries(displayOBJ polyscope geometry-central)

3-modeling/c++/deps/geometry-central

@@ -1 +0,0 @@
-Subproject commit ed6c9c9aeed217f5e41357eaf71e169fbbf3b912

3-modeling/c++/deps/polyscope

@@ -1 +0,0 @@
-Subproject commit a133cda65c423d4ee6379738a776d925683bd18d

3-modeling/cube.obj

@@ -1,40 +0,0 @@
-# Blender v2.91.2 OBJ File: ''
-# www.blender.org
-mtllib cube.mtl
-o Cube
-v 1.000000 1.000000 -1.000000
-v 1.000000 -1.000000 -1.000000
-v 1.000000 1.000000 1.000000
-v 1.000000 -1.000000 1.000000
-v -1.000000 1.000000 -1.000000
-v -1.000000 -1.000000 -1.000000
-v -1.000000 1.000000 1.000000
-v -1.000000 -1.000000 1.000000
-vt 0.625000 0.500000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.125000 0.500000
-vt 0.375000 0.500000
-vt 0.125000 0.750000
-vn 0.0000 1.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-usemtl Material
-s off
-f 1/1/1 5/2/1 7/3/1 3/4/1
-f 4/5/2 3/4/2 7/6/2 8/7/2
-f 8/8/3 7/9/3 5/10/3 6/11/3
-f 6/12/4 2/13/4 4/5/4 8/14/4
-f 2/13/5 1/1/5 3/4/5 4/5/5
-f 6/11/6 5/10/6 1/1/6 2/13/6

4-LaplacianSmoothing/c++/CMakeLists.txt

@@ -1,66 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-project(CGDI-4)
-
-
-# Print the build type
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release" FORCE)
-endif()
-message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
-
-### Configure the compiler
-# This is a basic, decent setup that should do something sane on most compilers
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-
-  # using Clang (linux or apple) or GCC
-  message("Using clang/gcc compiler flags")
-  SET(BASE_CXX_FLAGS "-std=c++11 -Wall -Wextra")
-  SET(DISABLED_WARNINGS " -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations -Wno-missing-braces -Wno-unused-private-field")
-  SET(TRACE_INCLUDES " -H -Wno-error=unused-command-line-argument")
-
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    message("Setting clang-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -ferror-limit=3 -fcolor-diagnostics")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -fsanitize=address -fno-limit-debug-info")
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    message("Setting gcc-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -fmax-errors=5")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3")
-    SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-maybe-uninitialized -Wno-format-zero-length -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-  endif()
-
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
-
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  # using Visual Studio C++
-  message("Using Visual Studio compiler flags")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /W4")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /MP") # parallel build
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4267\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4244\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4305\"")  # ignore truncation on initialization
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-
-  add_definitions(/D "_CRT_SECURE_NO_WARNINGS")
-  add_definitions(-DNOMINMAX)
-  add_definitions(-D_USE_MATH_DEFINES)
-else()
-  # unrecognized
-  message( FATAL_ERROR "Unrecognized compiler [${CMAKE_CXX_COMPILER_ID}]" )
-endif()
-
-
-# == Deps
-add_subdirectory(deps/geometry-central)
-add_subdirectory(deps/polyscope)
-
-# == Build our project stuff
-
-
-add_executable(displayOBJ displayOBJ)
-target_link_libraries(displayOBJ polyscope geometry-central)

4-LaplacianSmoothing/c++/deps/geometry-central

@@ -1 +0,0 @@
-Subproject commit ed6c9c9aeed217f5e41357eaf71e169fbbf3b912

4-LaplacianSmoothing/c++/deps/polyscope

@@ -1 +0,0 @@
-Subproject commit a133cda65c423d4ee6379738a776d925683bd18d

5-GeomProcessing/CMakeLists.txt

@@ -1,66 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-project(CGDI-5)
-
-
-# Print the build type
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release" FORCE)
-endif()
-message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
-
-### Configure the compiler
-# This is a basic, decent setup that should do something sane on most compilers
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-
-  # using Clang (linux or apple) or GCC
-  message("Using clang/gcc compiler flags")
-  SET(BASE_CXX_FLAGS "-std=c++11 -Wall -Wextra")
-  SET(DISABLED_WARNINGS " -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations -Wno-missing-braces -Wno-unused-private-field")
-  SET(TRACE_INCLUDES " -H -Wno-error=unused-command-line-argument")
-
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    message("Setting clang-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -ferror-limit=3 -fcolor-diagnostics")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -fsanitize=address -fno-limit-debug-info")
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    message("Setting gcc-specific options")
-    SET(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -fmax-errors=5")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-g3")
-    SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-maybe-uninitialized -Wno-format-zero-length -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-  endif()
-
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
-
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  # using Visual Studio C++
-  message("Using Visual Studio compiler flags")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /W4")
-  set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} /MP") # parallel build
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4267\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4244\"")  # ignore conversion to smaller type (fires more aggressively than the gcc version, which is annoying)
-  SET(DISABLED_WARNINGS "${DISABLED_WARNINGS} /wd\"4305\"")  # ignore truncation on initialization
-  SET(CMAKE_CXX_FLAGS "${BASE_CXX_FLAGS} ${DISABLED_WARNINGS}")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-
-  add_definitions(/D "_CRT_SECURE_NO_WARNINGS")
-  add_definitions(-DNOMINMAX)
-  add_definitions(-D_USE_MATH_DEFINES)
-else()
-  # unrecognized
-  message( FATAL_ERROR "Unrecognized compiler [${CMAKE_CXX_COMPILER_ID}]" )
-endif()
-
-
-# == Deps
-add_subdirectory(deps/geometry-central)
-add_subdirectory(deps/polyscope)
-
-# == Build our project stuff
-
-
-add_executable(displayOBJ displayOBJ)
-target_link_libraries(displayOBJ polyscope geometry-central)

5-GeomProcessing/deps/geometry-central

@@ -1 +0,0 @@
-Subproject commit ed6c9c9aeed217f5e41357eaf71e169fbbf3b912

5-GeomProcessing/deps/polyscope

@@ -1 +0,0 @@
-Subproject commit a133cda65c423d4ee6379738a776d925683bd18d

geometry-processing/4-modeling/c++/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+add_executable(simpleTest simpleTest.cpp)
+target_link_libraries(simpleTest polyscope)
+
+add_executable(displayOBJ displayOBJ.cpp)
+target_link_libraries(displayOBJ polyscope geometry-central)

geometry-processing/4-modeling/c++/displayOBJ.cpp

@@ -1,9 +1,9 @@
-#include "geometrycentral/surface/manifold_surface_mesh.h"
-#include "geometrycentral/surface/meshio.h"
-#include "geometrycentral/surface/vertex_position_geometry.h"
+#include <geometrycentral/surface/manifold_surface_mesh.h>
+#include <geometrycentral/surface/meshio.h>
+#include <geometrycentral/surface/vertex_position_geometry.h>
 
-#include "polyscope/polyscope.h"
-#include "polyscope/surface_mesh.h"
+#include <polyscope/polyscope.h>
+#include <polyscope/surface_mesh.h>
 
 using namespace geometrycentral;
 using namespace geometrycentral::surface;

geometry-processing/5-LaplacianSmoothing/c++/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+
+
+add_executable(laplacian laplacian.cpp)
+target_link_libraries(laplacian polyscope geometry-central)

geometry-processing/5-LaplacianSmoothing/c++/laplacian.cpp

@@ -1,3 +1,4 @@
+
 #include "geometrycentral/surface/manifold_surface_mesh.h"
 #include "geometrycentral/surface/meshio.h"
 #include "geometrycentral/surface/vertex_position_geometry.h"

geometry-processing/6-GeomProcessing/c++/CMakeLists.txt

@@ -0,0 +1,3 @@
+
+add_executable(geomproc geomproc.cpp)
+target_link_libraries(geomproc polyscope geometry-central)

image-processing/1-SlicedOptimalTransport/c++/CMakeLists.txt

@@ -1,12 +1,7 @@
-PROJECT(OTColorTransfer)
-cmake_minimum_required(VERSION 3.1)
-
-set (CMAKE_CXX_STANDARD 11)
-
 set(EXAMPLES
   colorTransfer
 )
-
+  
 foreach(EXAMPLE ${EXAMPLES})
     add_executable(${EXAMPLE} ${EXAMPLE}.cpp)
     if(UNIX)

image-processing/1-SlicedOptimalTransport/c++/colorTransfer.cpp

@@ -28,15 +28,15 @@
 #include <random>
 #include <vector>
 //Command-line parsing
-#include "CLI11.hpp"
+#include <CLI11.hpp>
 
 //Image filtering and I/O
 #define cimg_display 0
-#include "CImg.h"
+#include <CImg.h>
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include <stb_image.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include <stb_image_write.h>
 
 //Global flag to silent verbose messages
 bool silent;

image-processing/3-Rasterization/c++/CMakeLists.txt

@@ -7,9 +7,6 @@ set(EXAMPLES
   rasterizer
 )
 
-
-include_directories(${PROJECT_SOURCE_DIR})
-
 foreach(EXAMPLE ${EXAMPLES})
     add_executable(${EXAMPLE} ${EXAMPLE}.cpp)
     if(UNIX)

image-processing/3-Rasterization/c++/rasterizer.cpp

@@ -7,7 +7,7 @@
 
 //Image filtering and I/O
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include <stb_image_write.h>
 
 //Global flag to silent verbose messages
 bool silent;