X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FCMakeLists.txt;h=b8c6121cdaeba1b476e87cd7667bd057840560e2;hb=031179ada6681b874314c450eeda806f9f8abd28;hp=31ba5f79e3fb2b6c2f45b90e13dbd68b0fced9d6;hpb=2eaafb182129c24c711adcc75ecacd74ce917141;p=modules%2Fshaper.git

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 31ba5f79e..b8c6121cd 100644
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -11,11 +11,11 @@ SET(PROJECT_HEADERS
 	PartSet_ExternalObjectsMgr.h
 	PartSet_Module.h
 	PartSet_OperationPrs.h
+        PartSet_OverconstraintListener.h
 	PartSet_Tools.h
 	PartSet_WidgetSketchLabel.h
 	PartSet_Validators.h
 	PartSet_WidgetPoint2d.h
-	PartSet_WidgetPoint2dAngle.h
 	PartSet_WidgetEditor.h
 	PartSet_WidgetMultiSelector.h
 	PartSet_WidgetPoint2dDistance.h
@@ -25,9 +25,11 @@ SET(PROJECT_HEADERS
 	PartSet_Filters.h
 	PartSet_FilterInfinite.h
 	PartSet_SketcherMgr.h
+	PartSet_SketcherReetntrantMgr.h
 	PartSet_MenuMgr.h
 	PartSet_WidgetSketchCreator.h
 	PartSet_IconFactory.h
+	PartSet_WidgetChoice.h
 )
 
 SET(PROJECT_SOURCES
@@ -35,13 +37,13 @@ SET(PROJECT_SOURCES
 	PartSet_ExternalObjectsMgr.cpp
 	PartSet_Module.cpp
 	PartSet_OperationPrs.cpp
+        PartSet_OverconstraintListener.cpp
 	PartSet_Tools.cpp
 	PartSet_WidgetSketchLabel.cpp
 	PartSet_Validators.cpp
 	PartSet_WidgetEditor.cpp
 	PartSet_WidgetMultiSelector.cpp
 	PartSet_WidgetPoint2d.cpp
-	PartSet_WidgetPoint2dAngle.cpp
 	PartSet_WidgetPoint2dDistance.cpp
 	PartSet_WidgetPoint2DFlyout.cpp
 	PartSet_WidgetShapeSelector.cpp
@@ -49,6 +51,7 @@ SET(PROJECT_SOURCES
 	PartSet_Filters.cpp
 	PartSet_FilterInfinite.cpp
 	PartSet_SketcherMgr.cpp
+	PartSet_SketcherReetntrantMgr.cpp
 	PartSet_MenuMgr.cpp
 	PartSet_WidgetSketchCreator.cpp
 	PartSet_IconFactory.cpp
@@ -90,24 +93,27 @@ SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO
 #SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES})
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI 
-                    ${CMAKE_SOURCE_DIR}/src/Config
-                    ${CMAKE_SOURCE_DIR}/src/Events
-                    ${CMAKE_SOURCE_DIR}/src/ModuleBase
-                    ${CMAKE_SOURCE_DIR}/src/ModelAPI
-                    ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
-                    ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
-                    ${CMAKE_SOURCE_DIR}/src/SketchPlugin
-                    ${CMAKE_SOURCE_DIR}/src/ExchangePlugin
-                    ${CMAKE_SOURCE_DIR}/src/SketcherPrs
-                    ${CMAKE_SOURCE_DIR}/src/FeaturesPlugin
-                    ${CMAKE_SOURCE_DIR}/src/PartSetPlugin
-                    ${CMAKE_SOURCE_DIR}/src/GeomAPI
-                    ${CMAKE_SOURCE_DIR}/src/AppElements
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
+                    ${PROJECT_SOURCE_DIR}/src/Config
+                    ${PROJECT_SOURCE_DIR}/src/Events
+                    ${PROJECT_SOURCE_DIR}/src/ModuleBase
+                    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+                    ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+                    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+                    ${PROJECT_SOURCE_DIR}/src/SketchPlugin
+                    ${PROJECT_SOURCE_DIR}/src/ExchangePlugin
+                    ${PROJECT_SOURCE_DIR}/src/SketcherPrs
+                    ${PROJECT_SOURCE_DIR}/src/FeaturesPlugin
+                    ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+                    ${PROJECT_SOURCE_DIR}/src/GeomAPI
                     ${CAS_INCLUDE_DIRS}
                     ${SUIT_INCLUDE}
 )
 
+IF(NOT ${HAVE_SALOME})
+  INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR})
+ENDIF(NOT ${HAVE_SALOME})
+
 ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(PartSet SHARED 
 	${PROJECT_SOURCES} 
@@ -124,3 +130,4 @@ ADD_DEPENDENCIES(PartSet ModuleBase)
 
 INSTALL(TARGETS PartSet DESTINATION bin)
 #INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+