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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b8c4783..272c1b159 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,17 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
+SET (NewGeom_Version 1.4.0)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
+INCLUDE(FindEclipse)
 INCLUDE(Common)
 INCLUDE(FindQt)
-INCLUDE(FindBoost)
 INCLUDE(FindPython)
 INCLUDE(FindSalome)
-INCLUDE(FindSolveSpace)
 INCLUDE(FindCAS)
+INCLUDE(FindSUIT)
 
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
@@ -21,14 +22,14 @@ 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")
       
       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.
+                                ctest          # Name of the test driver executable that runs the tests.
+                                coverage)      # Name of output directory.
     ENDIF(USE_TEST_COVERAGE)
     
     #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E")
@@ -37,30 +38,52 @@ IF(UNIX)
   ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(UNIX)
 
-
+#IF(CMAKE_BUILD_TYPE MATCHES Release)
+ADD_SUBDIRECTORY (doc)
+#ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
 ADD_SUBDIRECTORY (src/Config)
 ADD_SUBDIRECTORY (src/Events)
 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)
 ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/FeaturesPlugin)
+ADD_SUBDIRECTORY (src/SketcherPrs)
 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)
+
+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)
+    ADD_SUBDIRECTORY (src/NewGeom)
+    ADD_SUBDIRECTORY (src/ConnectorPlugin)
 ENDIF(${HAVE_SALOME})
 
 ENABLE_TESTING()
+
+# Add the uninstall target for eclipse IDE
+if (CMAKE_GENERATOR MATCHES "NMake Makefiles")
+configure_file("${CMAKE_SOURCE_DIR}/CMakeCommon/cmake_uninstall.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+               IMMEDIATE @ONLY)
+add_custom_target(uninstall
+                  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+endif (CMAKE_GENERATOR MATCHES "NMake Makefiles")