X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9c483844bf2deb85478c17722ea568cfa6e8172a;hb=b0196aeefbaa53754b1052fab904386707caad87;hp=ced9a4d2b9100a77b78ad60dbe8bb322c0f00cc5;hpb=0360e47a874c5776d439542ccec396fd02a96456;p=modules%2Fshaper.git diff --git a/CMakeLists.txt b/CMakeLists.txt index ced9a4d2b..9c483844b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ IF(WIN32) CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib ENDIF(WIN32) -SET (SHAPER_Version 8.5.0) +SET (SHAPER_Version CEA_2018-2) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON) @@ -38,7 +38,6 @@ INCLUDE(FindEclipse) INCLUDE(Common) INCLUDE(FindSalomeQt5) INCLUDE(FindSalome) -INCLUDE(FindCAS) INCLUDE(FindSUIT) INCLUDE(FindTInspector) @@ -64,8 +63,11 @@ IF(${HAVE_SALOME}) FIND_PACKAGE(SalomePythonInterp REQUIRED) FIND_PACKAGE(SalomePythonLibs REQUIRED) + FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) + ELSE(${HAVE_SALOME}) INCLUDE(FindPython) + INCLUDE(FindSalomeOpenCASCADE) ENDIF(${HAVE_SALOME}) # Common CMake macros @@ -112,10 +114,11 @@ ELSE(${HAVE_SALOME}) ENDIF(${HAVE_SALOME}) # Sketcher: Change radius of circular edges while dragging a point on the edge -SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE FALSE) +SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE TRUE) ADD_SUBDIRECTORY (src/Config) ADD_SUBDIRECTORY (src/Events) +ADD_SUBDIRECTORY (src/Selector) ADD_SUBDIRECTORY (src/Model) ADD_SUBDIRECTORY (src/XAO) ADD_SUBDIRECTORY (src/GeomAPI)