Merge branch 'master' into BR_PYTHON_PLUGIN

[modules/shaper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cfd58728f49cf36fb252188f1613f58cb53ffe2..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,6 +12,8 @@ INCLUDE(FindPython)
 INCLUDE(FindSalome)
 INCLUDE(FindSolveSpace)
 INCLUDE(FindCAS)
+INCLUDE(FindSUIT)
+
 
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
@@ -19,7 +22,7 @@ IF(UNIX)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     
     #Supporting test coverage checks (gcov) in the DEBUG mode
-    IF(CMAKE_BUILD_TYPE MATCHES Debug)
+    IF(USE_TEST_COVERAGE)
       INCLUDE(CodeCoverage)
       MESSAGE(STATUS "Setting flags for gcov support the the gcc...")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
@@ -29,7 +32,7 @@ IF(UNIX)
       SETUP_TARGET_FOR_COVERAGE(test_coverage  # Name for custom target.
                                                ctest          # Name of the test driver executable that runs the tests.
                                                coverage)      # Name of output directory.
-    ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
+    ENDIF(USE_TEST_COVERAGE)
     
     #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E")
     MESSAGE(STATUS "gcc flags are: " ${CMAKE_CXX_FLAGS})
@@ -49,19 +52,18 @@ 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/PyConsole)
-ADD_SUBDIRECTORY (src/PyEvent)
-ADD_SUBDIRECTORY (src/PyInterp)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/GeomApp)
+ADD_SUBDIRECTORY (src/ExchangePlugin)
+ADD_SUBDIRECTORY (src/GeomValidators)
 
 IF(${HAVE_SALOME})
        ADD_SUBDIRECTORY (src/NewGeom)
 ENDIF(${HAVE_SALOME})
 
-FIND_PACKAGE(PythonInterp REQUIRED)
 ENABLE_TESTING()