From: Sergey Belash <sergey.belash@opencascade.com>
Date: Thu, 13 Mar 2014 13:04:05 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.1~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cea3f78cfb7c796ba5be6bc9ee21e930abe14021;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	CMakeLists.txt
---

cea3f78cfb7c796ba5be6bc9ee21e930abe14021
diff --cc CMakeLists.txt
index 1d45e5620,d58767ec6..16974454f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -4,7 -4,10 +4,10 @@@ PROJECT (NewGEOM
  
  SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
  
+ INCLUDE(Common)
+ INCLUDE(FindQt5)
+ 
  #ADD_SUBDIRECTORY (src/ModelAPI)
 -#ADD_SUBDIRECTORY (src/Model)
 +ADD_SUBDIRECTORY (src/Model)
  ADD_SUBDIRECTORY (src/XGUI)
- #ADD_SUBDIRECTORY (src/GeomModule)
+ ADD_SUBDIRECTORY (src/GeomModule)