From: vsv <vitaly.smetannikov@opencascade.com>
Date: Wed, 12 Mar 2014 07:05:27 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.1~57^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43a3d2ddc3f899b5e1dcb36abd786148a0316814;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom
---

43a3d2ddc3f899b5e1dcb36abd786148a0316814
diff --cc CMakeLists.txt
index 89da6f727,607249a9e..4ffaeb0c8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -4,10 -4,7 +4,10 @@@ PROJECT (NewGEOM
  
  SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
  
 -ADD_SUBDIRECTORY (src/ModelAPI)
 -ADD_SUBDIRECTORY (src/Model)
 +INCLUDE(Common)
 +INCLUDE(FindQt5)
 +
 +#ADD_SUBDIRECTORY (src/ModelAPI)
 +#ADD_SUBDIRECTORY (src/Model)
  ADD_SUBDIRECTORY (src/XGUI)
- ADD_SUBDIRECTORY (src/GeomModule)
 -#ADD_SUBDIRECTORY (src/GeomModule)
++#ADD_SUBDIRECTORY (src/GeomModule)