Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cfd58728f49cf36fb252188f1613f58cb53ffe2..de2256284b03851b30e355ef5d298aba6f9b0981 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,10 @@ INCLUDE(FindSalome)
 INCLUDE(FindSolveSpace)
 INCLUDE(FindCAS)
 
+IF(NOT ${HAVE_SALOME})
+       INCLUDE(FindSUIT)
+ENDIF(NOT ${HAVE_SALOME})
+
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
     #C++11 is not supported on some platforms, disable it 
@@ -19,7 +23,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 +33,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})
@@ -53,9 +57,6 @@ 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)
 
@@ -63,5 +64,4 @@ IF(${HAVE_SALOME})
        ADD_SUBDIRECTORY (src/NewGeom)
 ENDIF(${HAVE_SALOME})
 
-FIND_PACKAGE(PythonInterp REQUIRED)
 ENABLE_TESTING()