X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=272c1b15920e15444343434b49502887adf480b8;hb=1ea8e041ffcc8d125d499265fc5b39e485001930;hp=e24cc90e79a7943e4cca4d69fd4a554bae205503;hpb=2e42dbc0ff89b6ec92b7829210321febf05c6d9f;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24cc90e7..272c1b159 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
-SET (NewGeom_Version 1.3.0)
+SET (NewGeom_Version 1.4.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 
@@ -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)
@@ -59,9 +58,13 @@ ADD_SUBDIRECTORY (src/SketchPlugin)
 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)