rm _WITH in module switches

.github/workflows/continuous.yml

@@ -79,7 +79,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} \
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} \
-            -DLIBIGL_WITH_COPYLEFT_CGAL=ON 
+            -DLIBIGL_COPYLEFT_CGAL=ON 
 
       - name: Build
         run: cd build; make -j2; ccache --show-stats
@@ -138,7 +138,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ^
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} ^
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} ^
-            -DLIBIGL_WITH_COPYLEFT_CGAL=ON ^
+            -DLIBIGL_COPYLEFT_CGAL=ON ^
             -DCMAKE_JOB_POOLS=pool-linking=1;pool-compilation=1 ^
             -DCMAKE_JOB_POOL_COMPILE:STRING=pool-compilation ^
             -DCMAKE_JOB_POOL_LINK:STRING=pool-linking ^

CMakeLists.txt

@@ -97,26 +97,26 @@ option(LIBIGL_USE_STATIC_LIBRARY "Use libigl as static library" ${LIBIGL_TOPLEVE
 
 # Permissive modules. These modules are available under MPL2 license, and their dependencies are available
 # under a permissive or public domain license.
-option(LIBIGL_WITH_EMBREE           "Build target igl::embree"           ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_GLFW             "Build target igl::glfw"             ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_IMGUI            "Build target igl::imgui"            ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_OPENGL           "Build target igl::opengl"           ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_PNG              "Build target igl::png"              ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_PREDICATES       "Build target igl::predicates"       ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_WITH_XML              "Build target igl::xml"              ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_EMBREE           "Build target igl::embree"           ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_GLFW             "Build target igl::glfw"             ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_IMGUI            "Build target igl::imgui"            ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_OPENGL           "Build target igl::opengl"           ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_PNG              "Build target igl::png"              ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_PREDICATES       "Build target igl::predicates"       ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_XML              "Build target igl::xml"              ${LIBIGL_TOPLEVEL_PROJECT})
 
 # Copyleft modules. These modules are available under GPL license, and their dependencies are
 # available under a copyleft license.
-option(LIBIGL_COPYLEFT_WITH_CORE    "Build target igl_copyleft::core"    ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_COPYLEFT_WITH_CGAL    "Build target igl_copyleft::cgal"    ${LIBIGL_DEFAULT_CGAL})
-option(LIBIGL_COPYLEFT_WITH_COMISO  "Build target igl_copyleft::comiso"  ${LIBIGL_TOPLEVEL_PROJECT})
-option(LIBIGL_COPYLEFT_WITH_TETGEN  "Build target igl_copyleft::tetgen"  ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_COPYLEFT_CORE    "Build target igl_copyleft::core"    ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_COPYLEFT_CGAL    "Build target igl_copyleft::cgal"    ${LIBIGL_DEFAULT_CGAL})
+option(LIBIGL_COPYLEFT_COMISO  "Build target igl_copyleft::comiso"  ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_COPYLEFT_TETGEN  "Build target igl_copyleft::tetgen"  ${LIBIGL_TOPLEVEL_PROJECT})
 
 # Restricted modules. These modules are available under MPL2 license, but their dependencies are
 # only available under a non-commercial or proprietary license.
-option(LIBIGL_RESTRICTED_WITH_MATLAB   "Build target igl_restricted::matlab"   ${LIBIGL_DEFAULT_MATLAB})
-option(LIBIGL_RESTRICTED_WITH_MOSEK    "Build target igl_restricted::mosek"    ${LIBIGL_DEFAULT_MOSEK})
-option(LIBIGL_RESTRICTED_WITH_TRIANGLE "Build target igl_restricted::triangle" ${LIBIGL_TOPLEVEL_PROJECT})
+option(LIBIGL_RESTRICTED_MATLAB   "Build target igl_restricted::matlab"   ${LIBIGL_DEFAULT_MATLAB})
+option(LIBIGL_RESTRICTED_MOSEK    "Build target igl_restricted::mosek"    ${LIBIGL_DEFAULT_MOSEK})
+option(LIBIGL_RESTRICTED_TRIANGLE "Build target igl_restricted::triangle" ${LIBIGL_TOPLEVEL_PROJECT})
 
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

LibiglOptions.cmake.sample

@@ -52,21 +52,21 @@
 # option(LIBIGL_USE_STATIC_LIBRARY "Use libigl as static library"          OFF)
 
 # Module options
-# option(LIBIGL_WITH_EMBREE              "Build target igl::embree"              ON)
-# option(LIBIGL_WITH_GLFW                "Build target igl::glfw"                ON)
-# option(LIBIGL_WITH_IMGUI               "Build target igl::imgui"               ON)
-# option(LIBIGL_WITH_OPENGL              "Build target igl::opengl"              ON)
-# option(LIBIGL_WITH_PNG                 "Build target igl::png"                 ON)
-# option(LIBIGL_WITH_PREDICATES          "Build target igl::predicates"          ON)
-# option(LIBIGL_WITH_XML                 "Build target igl::xml"                 ON)
-# option(LIBIGL_COPYLEFT_WITH_CGAL       "Build target igl_copyleft::cgal"       ON)
-# option(LIBIGL_COPYLEFT_WITH_COMISO     "Build target igl_copyleft::comiso"     ON)
-# option(LIBIGL_COPYLEFT_WITH_CORE       "Build target igl_copyleft::core"       ON)
-# option(LIBIGL_COPYLEFT_WITH_CORK       "Build target igl_copyleft::cork"       ON)
-# option(LIBIGL_COPYLEFT_WITH_TETGEN     "Build target igl_copyleft::tetgen"     ON)
-# option(LIBIGL_RESTRICTED_WITH_MATLAB   "Build target igl_restricted::matlab"   ON)
-# option(LIBIGL_RESTRICTED_WITH_MOSEK    "Build target igl_restricted::mosek"    ON)
-# option(LIBIGL_RESTRICTED_WITH_TRIANGLE "Build target igl_restricted::triangle" ON)
+# option(LIBIGL_EMBREE              "Build target igl::embree"              ON)
+# option(LIBIGL_GLFW                "Build target igl::glfw"                ON)
+# option(LIBIGL_IMGUI               "Build target igl::imgui"               ON)
+# option(LIBIGL_OPENGL              "Build target igl::opengl"              ON)
+# option(LIBIGL_PNG                 "Build target igl::png"                 ON)
+# option(LIBIGL_PREDICATES          "Build target igl::predicates"          ON)
+# option(LIBIGL_XML                 "Build target igl::xml"                 ON)
+# option(LIBIGL_COPYLEFT_CGAL       "Build target igl_copyleft::cgal"       ON)
+# option(LIBIGL_COPYLEFT_COMISO     "Build target igl_copyleft::comiso"     ON)
+# option(LIBIGL_COPYLEFT_CORE       "Build target igl_copyleft::core"       ON)
+# option(LIBIGL_COPYLEFT_CORK       "Build target igl_copyleft::cork"       ON)
+# option(LIBIGL_COPYLEFT_TETGEN     "Build target igl_copyleft::tetgen"     ON)
+# option(LIBIGL_RESTRICTED_MATLAB   "Build target igl_restricted::matlab"   ON)
+# option(LIBIGL_RESTRICTED_MOSEK    "Build target igl_restricted::mosek"    ON)
+# option(LIBIGL_RESTRICTED_TRIANGLE "Build target igl_restricted::triangle" ON)
 
 ################################################################################
 # FetchContent Options

cmake/igl/igl_include.cmake

@@ -28,7 +28,7 @@ function(_igl_include_full prefix name force)
     set(CMAKE_MODULE_PATH ${igl_module_path})
 
     # Include igl target definition
-    if(LIBIGL_WITH${prefix_uc}_${name_uc} OR ${force})
+    if(LIBIGL${prefix_uc}_${name_uc} OR ${force})
         include(${libigl_SOURCE_DIR}/cmake/igl/modules/${prefix}/${name}.cmake)
     endif()
 endfunction()