X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=18fbdfc7ca1c0001200b8802ed1aec2b4e92c936;hb=2af52b19b485181c61d1065fa45ec24b94cb1449;hp=248e6f91af64cc77e471c1623916b75906759bb5;hpb=24a99a1363325ac341314c3f2e18326841940fb7;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 248e6f91a..18fbdfc7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,46 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
 INCLUDE(Common)
-INCLUDE(FindQt5)
+INCLUDE(FindQt)
+INCLUDE(FindBoost)
+INCLUDE(FindPython)
+INCLUDE(FindSalome)
+INCLUDE(FindSolveSpace)
+
+IF(UNIX)
+    IF(CMAKE_COMPILER_IS_GNUCC)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+        MESSAGE(STATUS "Setting -std=c++0x flag for the gcc...")
+        MESSAGE(STATUS "Now gcc flags are: " ${CMAKE_CXX_FLAGS})
+        
+    ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(UNIX)
+
 
-ADD_SUBDIRECTORY (src/Event)
 ADD_SUBDIRECTORY (src/Config)
-#ADD_SUBDIRECTORY (src/ModelAPI)
-#ADD_SUBDIRECTORY (src/Model)
-ADD_SUBDIRECTORY (src/GeomModule)
+ADD_SUBDIRECTORY (src/Events)
+ADD_SUBDIRECTORY (src/Model)
+ADD_SUBDIRECTORY (src/ModelAPI)
+ADD_SUBDIRECTORY (src/GeomAPI)
+ADD_SUBDIRECTORY (src/GeomAlgoAPI)
+ADD_SUBDIRECTORY (src/GeomData)
+ADD_SUBDIRECTORY (src/GeomDataAPI)
+ADD_SUBDIRECTORY (src/PartSetPlugin)
+ADD_SUBDIRECTORY (src/ConstructionPlugin)
+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)
+
+IF(${HAVE_SALOME})
+	ADD_SUBDIRECTORY (src/NewGeom)
+ENDIF(${HAVE_SALOME})