Make name of level-2 sub-shape in the sketch naming equal as it is named at level...

[modules/shaper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4481c42bcf431e84d648b115076eaa8d729df787..cf84159d8699a4256881d52cd48bd5857d9d4b24 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,10 @@ PROJECT (SHAPER)
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
 IF(WIN32)
-  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
+  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib
 ENDIF(WIN32)
 
-SET (SHAPER_Version 2.6.0)
+SET (SHAPER_Version 2.7.1)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
@@ -20,8 +20,7 @@ INCLUDE(FindPython)
 INCLUDE(FindSalome)
 INCLUDE(FindCAS)
 INCLUDE(FindSUIT)
-INCLUDE(FindDFBrowser)
-INCLUDE(FindVInspector)
+INCLUDE(FindTInspector)
 
 # Find LibXml2
 IF(DEFINED ENV{LIBXML2_ROOT_DIR})
@@ -108,17 +107,18 @@ ADD_SUBDIRECTORY (src/PartSetAPI)
 ADD_SUBDIRECTORY (src/PrimitivesAPI)
 ADD_SUBDIRECTORY (src/SketchAPI)
 ADD_SUBDIRECTORY (src/GDMLAPI)
+# Tests
+ADD_SUBDIRECTORY (test.API/SHAPER)
 
 IF(${HAVE_SALOME})
     ADD_SUBDIRECTORY (src/SHAPERGUI)
     ADD_SUBDIRECTORY (src/ConnectorPlugin)
 ENDIF(${HAVE_SALOME})
 
-ADD_SUBDIRECTORY (test.models)
-
 ENABLE_TESTING()
 
 IF(ADD_MODELS_TESTS)
+  ADD_SUBDIRECTORY (test.models)
   ADD_CUSTOM_TARGET(run_unit_tests COMMAND ${CMAKE_CTEST_COMMAND} -C "${CMAKE_BUILD_TYPE}" -LE "models_tests")
 ENDIF(ADD_MODELS_TESTS)