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
Reverted some changes in salome build/run scripts.
[modules/shaper.git]
/
src
/
GeomAPI
/
CMakeLists.txt
diff --git
a/src/GeomAPI/CMakeLists.txt
b/src/GeomAPI/CMakeLists.txt
index 8e191e4fd53c93614ce1faf0e1a2025ce9b259a6..4959dde28860961bc060f21b1b58f7acfcf5fe7e 100644
(file)
--- a/
src/GeomAPI/CMakeLists.txt
+++ b/
src/GeomAPI/CMakeLists.txt
@@
-22,6
+22,7
@@
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE(UnitTest)
SET(PROJECT_HEADERS
GeomAPI.h
SET(PROJECT_HEADERS
GeomAPI.h
@@
-55,7
+56,18
@@
SET(PROJECT_HEADERS
GeomAPI_Ax3.h
GeomAPI_Trsf.h
GeomAPI_Angle2d.h
GeomAPI_Ax3.h
GeomAPI_Trsf.h
GeomAPI_Angle2d.h
+ GeomAPI_Angle.h
GeomAPI_Wire.h
GeomAPI_Wire.h
+ GeomAPI_Ellipse.h
+ GeomAPI_Ellipse2d.h
+ GeomAPI_Tools.h
+ GeomAPI_Shell.h
+ GeomAPI_Solid.h
+ GeomAPI_Sphere.h
+ GeomAPI_Cylinder.h
+ GeomAPI_Cone.h
+ GeomAPI_Torus.h
+ GeomAPI_Box.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-89,19
+101,27
@@
SET(PROJECT_SOURCES
GeomAPI_IPresentable.cpp
GeomAPI_Trsf.cpp
GeomAPI_Angle2d.cpp
GeomAPI_IPresentable.cpp
GeomAPI_Trsf.cpp
GeomAPI_Angle2d.cpp
+ GeomAPI_Angle.cpp
GeomAPI_Wire.cpp
GeomAPI_Wire.cpp
+ GeomAPI_Ellipse.cpp
+ GeomAPI_Ellipse2d.cpp
+ GeomAPI_Tools.cpp
+ GeomAPI_Shell.cpp
+ GeomAPI_Solid.cpp
+ GeomAPI_Sphere.cpp
+ GeomAPI_Cylinder.cpp
+ GeomAPI_Cone.cpp
+ GeomAPI_Torus.cpp
+ GeomAPI_Box.cpp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
- ${CAS_KERNEL}
- ${CAS_MODELER}
- ${CAS_VIEWER}
- ${CAS_SHAPE}
- ${CAS_TKTopAlgo}
- ${CAS_TKBO}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${OpenCASCADE_Visualization_LIBRARIES}
)
)
-ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${
CAS
_DEFINITIONS})
+ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${
OpenCASCADE
_DEFINITIONS})
ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
SET(CMAKE_SWIG_FLAGS -threads -Wall)
ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
SET(CMAKE_SWIG_FLAGS -threads -Wall)
@@
-110,7
+130,7
@@
SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
INCLUDE_DIRECTORIES(
SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
)
TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
)
TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
@@
-124,7
+144,11
@@
SET(SWIG_LINK_LIBRARIES
${PYTHON_LIBRARIES}
)
${PYTHON_LIBRARIES}
)
-SWIG_ADD_MODULE(GeomAPI python GeomAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+ SWIG_ADD_LIBRARY(GeomAPI LANGUAGE python SOURCES GeomAPI.i ${PROJECT_HEADERS})
+ELSE()
+ SWIG_ADD_MODULE(GeomAPI python GeomAPI.i ${PROJECT_HEADERS})
+ENDIF()
SWIG_LINK_LIBRARIES(GeomAPI ${SWIG_LINK_LIBRARIES})
IF(WIN32)
SWIG_LINK_LIBRARIES(GeomAPI ${SWIG_LINK_LIBRARIES})
IF(WIN32)
@@
-134,3
+158,12
@@
ENDIF(WIN32)
INSTALL(TARGETS _GeomAPI DESTINATION ${SHAPER_INSTALL_SWIG})
INSTALL(TARGETS GeomAPI DESTINATION ${SHAPER_INSTALL_BIN})
INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
INSTALL(TARGETS _GeomAPI DESTINATION ${SHAPER_INSTALL_SWIG})
INSTALL(TARGETS GeomAPI DESTINATION ${SHAPER_INSTALL_BIN})
INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
+
+ADD_UNIT_TESTS(
+ TestBox.py
+ TestCone.py
+ TestCylinder.py
+ TestPolygon.py
+ TestSphere.py
+ TestTorus.py
+)