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
Issue #2657: Impossible to create sketch line with start point in the origin
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
CMakeLists.txt
diff --git
a/src/GeomAlgoAPI/CMakeLists.txt
b/src/GeomAlgoAPI/CMakeLists.txt
index 78ca7b9d6f3d226184b19d46e5327797c9de3204..77e7d3b1ac24045d6b4f6ecad4b81eaf4324b65c 100644
(file)
--- a/
src/GeomAlgoAPI/CMakeLists.txt
+++ b/
src/GeomAlgoAPI/CMakeLists.txt
@@
-73,6
+73,12
@@
SET(PROJECT_HEADERS
GeomAlgoAPI_Symmetry.h
GeomAlgoAPI_Scale.h
GeomAlgoAPI_Circ2dBuilder.h
GeomAlgoAPI_Symmetry.h
GeomAlgoAPI_Scale.h
GeomAlgoAPI_Circ2dBuilder.h
+ GeomAlgoAPI_UnifySameDomain.h
+ GeomAlgoAPI_Fillet.h
+ GeomAlgoAPI_SortListOfShapes.h
+ GeomAlgoAPI_Filling.h
+ GeomAlgoAPI_CurveBuilder.h
+ GeomAlgoAPI_NExplode.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-124,6
+130,12
@@
SET(PROJECT_SOURCES
GeomAlgoAPI_Symmetry.cpp
GeomAlgoAPI_Scale.cpp
GeomAlgoAPI_Circ2dBuilder.cpp
GeomAlgoAPI_Symmetry.cpp
GeomAlgoAPI_Scale.cpp
GeomAlgoAPI_Circ2dBuilder.cpp
+ GeomAlgoAPI_UnifySameDomain.cpp
+ GeomAlgoAPI_Fillet.cpp
+ GeomAlgoAPI_SortListOfShapes.cpp
+ GeomAlgoAPI_Filling.cpp
+ GeomAlgoAPI_CurveBuilder.cpp
+ GeomAlgoAPI_NExplode.cpp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
@@
-131,25
+143,12
@@
SET(PROJECT_LIBRARIES
GeomAlgoImpl
ModelAPI
XAOShaper
GeomAlgoImpl
ModelAPI
XAOShaper
- ${CAS_OCAF}
- ${CAS_SHAPE}
- ${CAS_TKBO}
- ${CAS_TKBool}
- ${CAS_TKBRep}
- ${CAS_TKCAF}
- ${CAS_TKCAF}
- ${CAS_TKLCAF}
- ${CAS_TKPrim}
- ${CAS_TKSTEP}
- ${CAS_TKSTEPBase}
- ${CAS_TKIGES}
- ${CAS_TKTopAlgo}
- ${CAS_TKXSBase}
- ${CAS_TKOffset}
- ${CAS_TKShHealing}
+ ${OpenCASCADE_DataExchange_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${OpenCASCADE_ApplicationFramework_LIBRARIES}
)
)
-ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${
CAS
_DEFINITIONS})
+ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${
OpenCASCADE
_DEFINITIONS})
ADD_LIBRARY(GeomAlgoAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
SET(CMAKE_SWIG_FLAGS "-Wall")
ADD_LIBRARY(GeomAlgoAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
SET(CMAKE_SWIG_FLAGS "-Wall")
@@
-162,7
+161,7
@@
INCLUDE_DIRECTORIES(
../GeomAlgoImpl
../ModelAPI
../XAO
../GeomAlgoImpl
../ModelAPI
../XAO
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
)
TARGET_LINK_LIBRARIES(GeomAlgoAPI ${PROJECT_LIBRARIES})
)
TARGET_LINK_LIBRARIES(GeomAlgoAPI ${PROJECT_LIBRARIES})
@@
-178,7
+177,11
@@
SET(SWIG_LINK_LIBRARIES
${PYTHON_LIBRARIES}
)
${PYTHON_LIBRARIES}
)
-SWIG_ADD_MODULE(GeomAlgoAPI python GeomAlgoAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+ SWIG_ADD_LIBRARY(GeomAlgoAPI LANGUAGE python SOURCES GeomAlgoAPI.i ${PROJECT_HEADERS})
+ELSE()
+ SWIG_ADD_MODULE(GeomAlgoAPI python GeomAlgoAPI.i ${PROJECT_HEADERS})
+ENDIF()
SWIG_LINK_LIBRARIES(GeomAlgoAPI ${SWIG_LINK_LIBRARIES})
IF(WIN32)
SWIG_LINK_LIBRARIES(GeomAlgoAPI ${SWIG_LINK_LIBRARIES})
IF(WIN32)