X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=6f7f7a8f61c89112c814c11344037250dc317c14;hb=08ca8a9d855bd06716e3fceeb9cff59d30436cc4;hp=f1042dade8d9700e911dd188a865d35ee3b9dbc9;hpb=7b13546ebd4d7a935189869b0a0c7b72a6f84479;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1042dade..6f7f7a8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
-SET (NewGeom_Version 1.1.0)
+SET (NewGeom_Version 2.0.0)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
@@ -10,11 +10,9 @@ INCLUDE(Common)
 INCLUDE(FindQt)
 INCLUDE(FindPython)
 INCLUDE(FindSalome)
-INCLUDE(FindSolveSpace)
 INCLUDE(FindCAS)
 INCLUDE(FindSUIT)
 
-
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
     #C++11 is not supported on some platforms, disable it 
@@ -24,7 +22,7 @@ IF(UNIX)
     #Supporting test coverage checks (gcov) in the DEBUG mode
     IF(USE_TEST_COVERAGE)
       INCLUDE(CodeCoverage)
-      MESSAGE(STATUS "Setting flags for gcov support the the gcc...")
+      MESSAGE(STATUS "Setting flags for gcov support the gcc...")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
       SET(CMAKE_SHARED_LINKER_FLAGS "-lgcov")
@@ -41,7 +39,7 @@ IF(UNIX)
 ENDIF(UNIX)
 
 #IF(CMAKE_BUILD_TYPE MATCHES Release)
-  ADD_SUBDIRECTORY (doc)
+ADD_SUBDIRECTORY (doc)
 #ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
 ADD_SUBDIRECTORY (src/Config)
 ADD_SUBDIRECTORY (src/Events)
@@ -49,6 +47,7 @@ ADD_SUBDIRECTORY (src/Model)
 ADD_SUBDIRECTORY (src/ModelAPI)
 ADD_SUBDIRECTORY (src/GeomAPI)
 ADD_SUBDIRECTORY (src/GeomAlgoAPI)
+ADD_SUBDIRECTORY (src/GeomAlgoImpl)
 ADD_SUBDIRECTORY (src/GeomData)
 ADD_SUBDIRECTORY (src/GeomDataAPI)
 ADD_SUBDIRECTORY (src/PartSetPlugin)
@@ -56,16 +55,23 @@ ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/FeaturesPlugin)
 ADD_SUBDIRECTORY (src/SketcherPrs)
 ADD_SUBDIRECTORY (src/SketchPlugin)
+ADD_SUBDIRECTORY (src/SketchShapePlugin)
 ADD_SUBDIRECTORY (src/SketchSolver)
 ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
-ADD_SUBDIRECTORY (src/AppElements)
+
+IF(NOT ${HAVE_SALOME})
+    ADD_SUBDIRECTORY (src/AppElements)
+    ADD_SUBDIRECTORY (src/GeomApp)
+ENDIF(NOT ${HAVE_SALOME})
+
 ADD_SUBDIRECTORY (src/XGUI)
-ADD_SUBDIRECTORY (src/GeomApp)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
 ADD_SUBDIRECTORY (src/InitializationPlugin)
 ADD_SUBDIRECTORY (src/ParametersPlugin)
+ADD_SUBDIRECTORY (src/PythonAddons)
+ADD_SUBDIRECTORY (src/PythonAPI)
 
 IF(${HAVE_SALOME})
     ADD_SUBDIRECTORY (src/NewGeom)