Merge branch 'master' into BR_PYTHON_PLUGIN

[modules/shaper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de2256284b03851b30e355ef5d298aba6f9b0981..116d25f5b47946578ffbbd001d8aad19806d50a6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ PROJECT (NewGEOM)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
+INCLUDE(FindEclipse)
 INCLUDE(Common)
 INCLUDE(FindQt)
 INCLUDE(FindBoost)
@@ -11,10 +12,8 @@ INCLUDE(FindPython)
 INCLUDE(FindSalome)
 INCLUDE(FindSolveSpace)
 INCLUDE(FindCAS)
+INCLUDE(FindSUIT)
 
-IF(NOT ${HAVE_SALOME})
-       INCLUDE(FindSUIT)
-ENDIF(NOT ${HAVE_SALOME})
 
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
@@ -53,12 +52,15 @@ ADD_SUBDIRECTORY (src/GeomDataAPI)
 ADD_SUBDIRECTORY (src/PartSetPlugin)
 ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/FeaturesPlugin)
+ADD_SUBDIRECTORY (src/PythonFeaturesPlugin)
 ADD_SUBDIRECTORY (src/SketchPlugin)
 ADD_SUBDIRECTORY (src/SketchSolver)
 ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/GeomApp)
+ADD_SUBDIRECTORY (src/ExchangePlugin)
+ADD_SUBDIRECTORY (src/GeomValidators)
 
 IF(${HAVE_SALOME})
        ADD_SUBDIRECTORY (src/NewGeom)