diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03e57abf81f49a511e37899b5da06c3fe2cb8cc3..2c91a5246b5591538760dfcc5f8ca67bb0d9611a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,6 @@ include (plugin)
 
 SET( CURRENT_PLUGIN_DEPS "")
 
-if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/BSplineCurve)
-  add_definitions (-DENABLE_BSPLINECURVE_SUPPORT)
-endif()
-
-if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/BSplineSurface)
-  add_definitions (-DENABLE_BSPLINESURFACE_SUPPORT)
-endif ()
-
 if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh)
     add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
     add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT)
@@ -27,4 +19,6 @@ endif()
 list(REMOVE_DUPLICATES CURRENT_PLUGIN_DEPS )
 
 openflipper_plugin ( DEPS ${CURRENT_PLUGIN_DEPS}
-		     INSTALLDATA Icons )
+		     INSTALLDATA Icons 
+                     TYPES POLYMESH TRIANGLEMESH
+                     OPT_TYPES BSPLINESURFACE BSPLINECURVE)