Merge branch 'master' into cgt/devCEA

[modules/shaper.git] / src / PythonAPI / CMakeLists.txt

diff --git a/src/PythonAPI/CMakeLists.txt b/src/PythonAPI/CMakeLists.txt
index 909e9bdfb176a8d5b00bf0a0a8c78f8bd157a2b2..f68c872585210383296496a7122f21bb1a9d8a86 100644 (file)
--- a/src/PythonAPI/CMakeLists.txt
+++ b/src/PythonAPI/CMakeLists.txt
@@ -1,10 +1,9 @@
 ## Copyright (C) 2014-20xx  OPEN CASCADE
 
-
-SET(CMAKE_AUTOMOC ON)
-
-INSTALL(DIRECTORY extension geom model examples DESTINATION ${SHAPER_INSTALL_PYTHON_API})
-INSTALL(FILES shaper.py DESTINATION ${SHAPER_INSTALL_PYTHON_API})
+INSTALL(DIRECTORY geom model examples DESTINATION ${SHAPER_INSTALL_PYTHON_API})
+INSTALL(FILES __init__.py DESTINATION ${SHAPER_INSTALL_PYTHON_API})
+INSTALL(FILES __init__.py DESTINATION ${_pydir}/salome)
+INSTALL(FILES initConfig.py DESTINATION ${SHAPER_INSTALL_PYTHON_API})
 
 # --------- Unit tests -----------
 INCLUDE(UnitTest)
@@ -24,19 +23,20 @@ ADD_UNIT_TESTS(
   TestSketcherSetPerpendicular.py
   TestSketcherSetHorizontal.py
   TestSketcherSetVertical.py
-  TestSketcherSetRigid.py
+  TestSketcherSetFixed.py
   TestSketcherSetLength.py
   TestSketcherSetRadius.py
-  TestSketcherSetAngle.py
+  #TestSketcherSetAngle.py
   TestSketcherSetEqual.py
   TestSketcherSetFillet.py
 
   TestFeatures.py
   TestFeaturesExtrusion.py
-  TestFeaturesRevolution.py
+  #TestFeaturesRevolution.py
+  
+  TestPrimitivesBox.py
 
   TestMakeBrick1.py
   TestMakeBrick2.py
-  TestMakeBrick3.py
   TestPlatine.py
   )