X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=0cf7163c24bdc1fd8fef768eb1a502ecb4bc26cd;hb=b2418a13c302e03ed5f80dbdae0cd20f0abd16af;hp=116d25f5b47946578ffbbd001d8aad19806d50a6;hpb=f4f01be0d0f2642aaca4844b34c98a062e2afbb9;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 116d25f5b..0cf7163c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
+SET (NewGeom_Version 1.1.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)
@@ -30,8 +30,8 @@ IF(UNIX)
       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")
@@ -40,7 +40,9 @@ 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)
@@ -52,18 +54,32 @@ ADD_SUBDIRECTORY (src/GeomDataAPI)
 ADD_SUBDIRECTORY (src/PartSetPlugin)
 ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/FeaturesPlugin)
+ADD_SUBDIRECTORY (src/SketcherPrs)
 ADD_SUBDIRECTORY (src/PythonFeaturesPlugin)
 ADD_SUBDIRECTORY (src/SketchPlugin)
 ADD_SUBDIRECTORY (src/SketchSolver)
 ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
+ADD_SUBDIRECTORY (src/AppElements)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/GeomApp)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
+ADD_SUBDIRECTORY (src/InitializationPlugin)
+ADD_SUBDIRECTORY (src/ParametersPlugin)
 
 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")