X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=223001654d8af64d32e6ca78337d7cd769ad1fec;hb=e0599afe13a8f2be4fe593e6d50b23a23b0a6c81;hp=89da6f7270803a7c9e4ec24819432133448ad19e;hpb=54c039ab2b209cf0aa20993ddb4d92ed2848b2f2;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89da6f727..223001654 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,44 @@
-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)
 
-#ADD_SUBDIRECTORY (src/ModelAPI)
-#ADD_SUBDIRECTORY (src/Model)
+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/Config)
+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/ModuleBase)
+ADD_SUBDIRECTORY (src/PartSet)
+ADD_SUBDIRECTORY (src/PyConsole)
+ADD_SUBDIRECTORY (src/PyEvent)
+ADD_SUBDIRECTORY (src/PyInterp)
 ADD_SUBDIRECTORY (src/XGUI)
-ADD_SUBDIRECTORY (src/GeomModule)
\ No newline at end of file
+ADD_SUBDIRECTORY (src/GeomApp)
+
+IF(${HAVE_SALOME})
+	ADD_SUBDIRECTORY (src/NewGeom)
+ENDIF(${HAVE_SALOME})