Cleanup: remove unused CMake WITH_MOD_CLOTH_ELTOPO option
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Nov 2019 03:52:44 +0000 (14:52 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Nov 2019 03:52:44 +0000 (14:52 +1100)
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
extern/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt

index 53b3fb8d28251542a99c7fcb0c8b55ab567e6dc1..aeec259c3b72999005b3ef4cce6f081efc7cbe1c 100644 (file)
@@ -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
index 4bc0565754cd9e21ca01743366bc82385784980f..7dff91bc2b246e97b7786a9d4fa40e99275536e8 100644 (file)
@@ -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()
index 67b2310629916990a3a9ec6644d261daa8f43bfb..c9cdef22aceaa7bd36961d4391052f6b77f385de 100644 (file)
@@ -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)
index 1952e418cfb2c4d042de933a5fdc0cb840cb1ba5..b985a39106b15e2f49cce8f76fba95c7bfa04004 100644 (file)
@@ -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()
index f80744feeccf778b78e2b01ec9b1d09b11a6bbc6..3bbb133c72ff47e853c4361fdc40e25a5ca62471 100644 (file)
@@ -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()