Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for creation in GUI and unit-test for the issue #2681
[modules/shaper.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index d4989dc9290295d57cd2d1ccaf1618b04bc21cd2..9c483844bf2deb85478c17722ea568cfa6e8172a 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-27,10
+27,10
@@
IF(WIN32)
CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib
ENDIF(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})
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
-OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" O
FF
)
+OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" O
N
)
INCLUDE(SalomeMacros)
INCLUDE(SalomeMacros)
@@
-38,7
+38,6
@@
INCLUDE(FindEclipse)
INCLUDE(Common)
INCLUDE(FindSalomeQt5)
INCLUDE(FindSalome)
INCLUDE(Common)
INCLUDE(FindSalomeQt5)
INCLUDE(FindSalome)
-INCLUDE(FindCAS)
INCLUDE(FindSUIT)
INCLUDE(FindTInspector)
INCLUDE(FindSUIT)
INCLUDE(FindTInspector)
@@
-64,8
+63,11
@@
IF(${HAVE_SALOME})
FIND_PACKAGE(SalomePythonInterp REQUIRED)
FIND_PACKAGE(SalomePythonLibs REQUIRED)
FIND_PACKAGE(SalomePythonInterp REQUIRED)
FIND_PACKAGE(SalomePythonLibs REQUIRED)
+ FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
+
ELSE(${HAVE_SALOME})
INCLUDE(FindPython)
ELSE(${HAVE_SALOME})
INCLUDE(FindPython)
+ INCLUDE(FindSalomeOpenCASCADE)
ENDIF(${HAVE_SALOME})
# Common CMake macros
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
ENDIF(${HAVE_SALOME})
# Sketcher: Change radius of circular edges while dragging a point on the edge
-SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE
FALS
E)
+SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE
TRU
E)
ADD_SUBDIRECTORY (src/Config)
ADD_SUBDIRECTORY (src/Events)
ADD_SUBDIRECTORY (src/Config)
ADD_SUBDIRECTORY (src/Events)
+ADD_SUBDIRECTORY (src/Selector)
ADD_SUBDIRECTORY (src/Model)
ADD_SUBDIRECTORY (src/XAO)
ADD_SUBDIRECTORY (src/GeomAPI)
ADD_SUBDIRECTORY (src/Model)
ADD_SUBDIRECTORY (src/XAO)
ADD_SUBDIRECTORY (src/GeomAPI)