From b2d940250c73e055a2eb82f51ac7d2e352623995 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 25 Nov 2019 14:52:44 +1100
Subject: Cleanup: remove unused CMake WITH_MOD_CLOTH_ELTOPO option

---
 CMakeLists.txt                                  |  2 --
 build_files/cmake/macros.cmake                  |  3 ---
 build_files/cmake/platform/platform_win32.cmake | 11 -----------
 extern/CMakeLists.txt                           |  5 -----
 source/blender/blenkernel/CMakeLists.txt        |  8 --------
 5 files changed, 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53b3fb8d282..aeec259c3b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,8 +315,6 @@ endif()
 option(WITH_MOD_FLUID           "Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
-# option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)  # this is now only available in a branch
-# mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 4bc0565754c..7dff91bc2b2 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -534,9 +534,6 @@ function(setup_liblinks
       )
     endif()
   endif()
-  if(WITH_MOD_CLOTH_ELTOPO)
-    target_link_libraries(${target} ${LAPACK_LIBRARIES})
-  endif()
   if(WITH_LLVM)
     target_link_libraries(${target} ${LLVM_LIBRARY})
   endif()
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 67b23106299..c9cdef22ace 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -517,17 +517,6 @@ if(WITH_ALEMBIC)
   set(ALEMBIC_FOUND 1)
 endif()
 
-if(WITH_MOD_CLOTH_ELTOPO)
-  set(LAPACK ${LIBDIR}/lapack)
-  # set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
-  set(LAPACK_LIBPATH ${LAPACK}/lib)
-  set(LAPACK_LIBRARIES
-    ${LIBDIR}/lapack/lib/libf2c.lib
-    ${LIBDIR}/lapack/lib/clapack_nowrap.lib
-    ${LIBDIR}/lapack/lib/BLAS_nowrap.lib
-  )
-endif()
-
 if(WITH_IMAGE_OPENJPEG)
   set(OPENJPEG ${LIBDIR}/openjpeg)
   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 1952e418cfb..b985a39106b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -45,11 +45,6 @@ if(WITH_DRACO)
   add_subdirectory(draco)
 endif()
 
-# now only available in a branch
-# if(WITH_MOD_CLOTH_ELTOPO)
-#    add_subdirectory(eltopo)
-# endif()
-
 if(WITH_BINRELOC)
   add_subdirectory(binreloc)
 endif()
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f80744feecc..3bbb133c72f 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -442,14 +442,6 @@ if(WITH_BULLET)
   add_definitions(-DWITH_BULLET)
 endif()
 
-# if(WITH_MOD_CLOTH_ELTOPO)
-#   list(APPEND INC
-#     ../../../extern/eltopo
-#     ../../../extern/eltopo/eltopo3d
-#   )
-#   add_definitions(-DWITH_ELTOPO)
-# endif()
-
 if(WITH_IMAGE_OPENEXR)
   add_definitions(-DWITH_OPENEXR)
 endif()
-- 
cgit v1.2.3