Commit 2cc46a9c authored by Dennis Gläser's avatar Dennis Gläser
Browse files

[cmake] avoid deprecation warnings

parent 2bd56161
Pipeline #2841 passed with stages
in 10 minutes and 3 seconds
frackit_add_test(NAME example1 frackit_register_test(NAME example1
SOURCES example1.cc SOURCES example1.cc
LABELS example LABELS example
CMD_ARGS 5) CMD_ARGS 5)
frackit_symlink_or_copy(FILES example1.py) frackit_link_from_build_dir(FILES example1.py)
frackit_add_test(NAME example2 frackit_register_test(NAME example2
SOURCES example2.cc SOURCES example2.cc
LABELS example LABELS example
CMD_ARGS 5) CMD_ARGS 5)
frackit_symlink_or_copy(FILES example2.py) frackit_link_from_build_dir(FILES example2.py)
frackit_add_test(NAME example3 frackit_register_test(NAME example3
SOURCES example3.cc SOURCES example3.cc
COMPILE_DEFINITIONS BREPFILE="layers.brep" COMPILE_DEFINITIONS BREPFILE="layers.brep"
LABELS example LABELS example
CMD_ARGS 3) CMD_ARGS 3)
frackit_symlink_or_copy(FILES example3.py layers.brep) frackit_link_from_build_dir(FILES example3.py layers.brep)
frackit_add_test(NAME example4 frackit_register_test(NAME example4
SOURCES example4.cc SOURCES example4.cc
LABELS example LABELS example
COMMAND ./example4 COMMAND ./example4
CMD_ARGS 5) CMD_ARGS 5)
frackit_symlink_or_copy(FILES example4.py)
frackit_link_from_build_dir(FILES example4.py)
...@@ -4,7 +4,7 @@ if (FRACKIT_ENABLE_PYTHONBINDINGS) ...@@ -4,7 +4,7 @@ if (FRACKIT_ENABLE_PYTHONBINDINGS)
# modify contents (version etc) in setup file and symlink # modify contents (version etc) in setup file and symlink
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
${CMAKE_CURRENT_SOURCE_DIR}/setup.py) ${CMAKE_CURRENT_SOURCE_DIR}/setup.py)
frackit_symlink_or_copy(FILES setup.py) frackit_link_from_build_dir(FILES setup.py)
# define target for python library # define target for python library
add_custom_target(install_python add_custom_target(install_python
......
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_common _common.cc) pybind11_add_module(_common _common.cc)
add_subdirectory(iterators) add_subdirectory(iterators)
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_entitynetwork _entitynetwork.cc) pybind11_add_module(_entitynetwork _entitynetwork.cc)
target_link_libraries(_entitynetwork PRIVATE ${OCC_LIBS}) target_link_libraries(_entitynetwork PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_iterators _iterators.cc) pybind11_add_module(_iterators _iterators.cc)
target_link_libraries(_iterators PRIVATE ${OCC_LIBS}) target_link_libraries(_iterators PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_geometry _geometry.cc) pybind11_add_module(_geometry _geometry.cc)
target_link_libraries(_geometry PRIVATE ${OCC_LIBS}) target_link_libraries(_geometry PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_io _io.cc) pybind11_add_module(_io _io.cc)
target_link_libraries(_io PRIVATE ${OCC_LIBS}) target_link_libraries(_io PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_occutilities _occutilities.cc) pybind11_add_module(_occutilities _occutilities.cc)
target_link_libraries(_occutilities PRIVATE ${OCC_LIBS}) target_link_libraries(_occutilities PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_precision _precision.cc) pybind11_add_module(_precision _precision.cc)
target_link_libraries(_precision PRIVATE ${OCC_LIBS}) target_link_libraries(_precision PRIVATE ${OCC_LIBS})
frackit_symlink_or_copy(FILES __init__.py) frackit_link_from_build_dir(FILES __init__.py)
pybind11_add_module(_sampling _sampling.cc) pybind11_add_module(_sampling _sampling.cc)
############################# #############################
# test distance computation # # test distance computation #
############################# #############################
frackit_add_test(NAME test_distance_linear SOURCES test_distance_linear.cc LABELS geometry distance) frackit_register_test(NAME test_distance_linear SOURCES test_distance_linear.cc LABELS geometry distance)
frackit_add_test(NAME test_distance_disk SOURCES test_distance_disk.cc LABELS geometry distance) frackit_register_test(NAME test_distance_disk SOURCES test_distance_disk.cc LABELS geometry distance)
frackit_add_test(NAME test_distancetoboundary SOURCES test_distancetoboundary.cc LABELS geometry distance) frackit_register_test(NAME test_distancetoboundary SOURCES test_distancetoboundary.cc LABELS geometry distance)
...@@ -3,32 +3,32 @@ ...@@ -3,32 +3,32 @@
########################################## ##########################################
# test network constaints (disks) # test network constaints (disks)
frackit_add_test(NAME test_constraints_disk frackit_register_test(NAME test_constraints_disk
SOURCES test_constraints_disk.cc SOURCES test_constraints_disk.cc
LABELS entitynetwork constraints) LABELS entitynetwork constraints)
# test network constaints (quads) # test network constaints (quads)
frackit_add_test(NAME test_constraints_quads frackit_register_test(NAME test_constraints_quads
SOURCES test_constraints_quads.cc SOURCES test_constraints_quads.cc
LABELS entitynetwork constraints) LABELS entitynetwork constraints)
# test network constaints (cylinder surface) # test network constaints (cylinder surface)
frackit_add_test(NAME test_constraints_cylindersurface frackit_register_test(NAME test_constraints_cylindersurface
SOURCES test_constraints_cylindersurface.cc SOURCES test_constraints_cylindersurface.cc
LABELS entitynetwork constraints) LABELS entitynetwork constraints)
# test disk network creation (in cylinder) # test disk network creation (in cylinder)
frackit_add_test(NAME test_generate_disk_network_cylinder frackit_register_test(NAME test_generate_disk_network_cylinder
SOURCES test_generate_disk_network_cylinder.cc SOURCES test_generate_disk_network_cylinder.cc
LABELS entitynetwork sampling) LABELS entitynetwork sampling)
# test disk network creation (in shape from file) # test disk network creation (in shape from file)
frackit_add_test(NAME test_generate_disk_network_shape frackit_register_test(NAME test_generate_disk_network_shape
SOURCES test_generate_disk_network_shape.cc SOURCES test_generate_disk_network_shape.cc
LABELS entitynetwork sampling LABELS entitynetwork sampling
COMPILE_DEFINITIONS BREPFILE="${CMAKE_SOURCE_DIR}/test/entitynetwork/layer.brep") COMPILE_DEFINITIONS BREPFILE="${CMAKE_SOURCE_DIR}/test/entitynetwork/layer.brep")
# test entity network classes & corresponding I/O # test entity network classes & corresponding I/O
frackit_add_test(NAME test_entity_network_3d frackit_register_test(NAME test_entity_network_3d
SOURCES test_entity_network_3d.cc SOURCES test_entity_network_3d.cc
LABELS entitynetwork) LABELS entitynetwork)
###################################### ######################################
# test functionalities of geometries # # test functionalities of geometries #
###################################### ######################################
frackit_add_test(NAME test_point SOURCES test_point.cc LABELS geometry) frackit_register_test(NAME test_point SOURCES test_point.cc LABELS geometry)
frackit_add_test(NAME test_vector SOURCES test_vector.cc LABELS geometry) frackit_register_test(NAME test_vector SOURCES test_vector.cc LABELS geometry)
frackit_add_test(NAME test_direction SOURCES test_direction.cc LABELS geometry) frackit_register_test(NAME test_direction SOURCES test_direction.cc LABELS geometry)
frackit_add_test(NAME test_plane SOURCES test_plane.cc LABELS geometry) frackit_register_test(NAME test_plane SOURCES test_plane.cc LABELS geometry)
frackit_add_test(NAME test_circle SOURCES test_circle.cc LABELS geometry) frackit_register_test(NAME test_circle SOURCES test_circle.cc LABELS geometry)
frackit_add_test(NAME test_cylindricalsurface SOURCES test_cylindricalsurface.cc LABELS geometry) frackit_register_test(NAME test_cylindricalsurface SOURCES test_cylindricalsurface.cc LABELS geometry)
frackit_add_test(NAME test_cylinder SOURCES test_cylinder.cc LABELS geometry) frackit_register_test(NAME test_cylinder SOURCES test_cylinder.cc LABELS geometry)
frackit_add_test(NAME test_hollowcylinder SOURCES test_hollowcylinder.cc LABELS geometry) frackit_register_test(NAME test_hollowcylinder SOURCES test_hollowcylinder.cc LABELS geometry)
frackit_add_test(NAME test_disk SOURCES test_disk.cc LABELS geometry) frackit_register_test(NAME test_disk SOURCES test_disk.cc LABELS geometry)
frackit_add_test(NAME test_ellipsearc SOURCES test_ellipsearc.cc LABELS geometry) frackit_register_test(NAME test_ellipsearc SOURCES test_ellipsearc.cc LABELS geometry)
frackit_add_test(NAME test_geometryname SOURCES test_geometryname.cc LABELS geometry) frackit_register_test(NAME test_geometryname SOURCES test_geometryname.cc LABELS geometry)
frackit_add_test(NAME test_triangle SOURCES test_triangle.cc LABELS geometry) frackit_register_test(NAME test_triangle SOURCES test_triangle.cc LABELS geometry)
frackit_add_test(NAME test_polygon SOURCES test_polygon.cc LABELS geometry) frackit_register_test(NAME test_polygon SOURCES test_polygon.cc LABELS geometry)
frackit_add_test(NAME test_quadrilateral SOURCES test_quadrilateral.cc LABELS geometry) frackit_register_test(NAME test_quadrilateral SOURCES test_quadrilateral.cc LABELS geometry)
frackit_add_test(NAME test_box SOURCES test_box.cc LABELS geometry) frackit_register_test(NAME test_box SOURCES test_box.cc LABELS geometry)
frackit_add_test(NAME test_boundingbox SOURCES test_boundingbox.cc LABELS geometry) frackit_register_test(NAME test_boundingbox SOURCES test_boundingbox.cc LABELS geometry)
frackit_add_test(NAME test_sphere SOURCES test_sphere.cc LABELS geometry) frackit_register_test(NAME test_sphere SOURCES test_sphere.cc LABELS geometry)
frackit_add_test(NAME test_name SOURCES test_name.cc LABELS geometry) frackit_register_test(NAME test_name SOURCES test_name.cc LABELS geometry)
...@@ -3,86 +3,86 @@ ...@@ -3,86 +3,86 @@
################################################### ###################################################
# bounding box intersection # bounding box intersection
frackit_add_test(NAME test_bbox_intersection frackit_register_test(NAME test_bbox_intersection
SOURCES test_bbox_intersection.cc SOURCES test_bbox_intersection.cc
LABELS intersection) LABELS intersection)
# intersection angles # intersection angles
frackit_add_test(NAME test_intersectionangle frackit_register_test(NAME test_intersectionangle
SOURCES test_intersectionangle.cc SOURCES test_intersectionangle.cc
LABELS intersection) LABELS intersection)
# segment - segment # segment - segment
frackit_add_test(NAME test_segment_segment_intersection frackit_register_test(NAME test_segment_segment_intersection
SOURCES test_segment_segment_intersection.cc SOURCES test_segment_segment_intersection.cc
LABELS intersection) LABELS intersection)
# plane - plane # plane - plane
frackit_add_test(NAME test_plane_plane_intersection frackit_register_test(NAME test_plane_plane_intersection
SOURCES test_plane_plane_intersection.cc SOURCES test_plane_plane_intersection.cc
LABELS intersection) LABELS intersection)
# disk - line # disk - line
frackit_add_test(NAME test_disk_line_intersection frackit_register_test(NAME test_disk_line_intersection
SOURCES test_disk_line_intersection.cc SOURCES test_disk_line_intersection.cc
LABELS intersection) LABELS intersection)
# quadrilateral - line # quadrilateral - line
frackit_add_test(NAME test_quad_line_intersection frackit_register_test(NAME test_quad_line_intersection
SOURCES test_quad_line_intersection.cc SOURCES test_quad_line_intersection.cc
LABELS intersection) LABELS intersection)
# disk - disk # disk - disk
frackit_add_test(NAME test_disk_disk_intersection frackit_register_test(NAME test_disk_disk_intersection
SOURCES test_disk_disk_intersection.cc SOURCES test_disk_disk_intersection.cc
LABELS intersection) LABELS intersection)
# quadrilateral - quadrilateral # quadrilateral - quadrilateral
frackit_add_test(NAME test_quad_quad_intersection frackit_register_test(NAME test_quad_quad_intersection
SOURCES test_quad_quad_intersection.cc SOURCES test_quad_quad_intersection.cc
LABELS intersection) LABELS intersection)
# polygon - polygon # polygon - polygon
frackit_add_test(NAME test_polygon_polygon_intersection frackit_register_test(NAME test_polygon_polygon_intersection
SOURCES test_polygon_polygon_intersection.cc SOURCES test_polygon_polygon_intersection.cc
LABELS intersection) LABELS intersection)
# polygon - polygon # polygon - polygon
frackit_add_test(NAME test_polygon_face_intersection frackit_register_test(NAME test_polygon_face_intersection
SOURCES test_polygon_face_intersection.cc SOURCES test_polygon_face_intersection.cc
LABELS intersection) LABELS intersection)
# polygon - disk # polygon - disk
frackit_add_test(NAME test_polygon_disk_intersection frackit_register_test(NAME test_polygon_disk_intersection
SOURCES test_polygon_disk_intersection.cc SOURCES test_polygon_disk_intersection.cc
LABELS intersection) LABELS intersection)
# cylinder surface - disk # cylinder surface - disk
frackit_add_test(NAME test_cylindersurface_disk_intersection frackit_register_test(NAME test_cylindersurface_disk_intersection
SOURCES test_cylindersurface_disk_intersection.cc SOURCES test_cylindersurface_disk_intersection.cc
LABELS intersection) LABELS intersection)
# cylinder surface - polygon (tests quadrilateral as well) # cylinder surface - polygon (tests quadrilateral as well)
frackit_add_test(NAME test_cylindersurface_polygon_intersection frackit_register_test(NAME test_cylindersurface_polygon_intersection
SOURCES test_cylindersurface_polygon_intersection.cc SOURCES test_cylindersurface_polygon_intersection.cc
LABELS intersection) LABELS intersection)
# face - disk # face - disk
frackit_add_test(NAME test_disk_face_intersection frackit_register_test(NAME test_disk_face_intersection
SOURCES test_disk_face_intersection.cc SOURCES test_disk_face_intersection.cc
LABELS intersection) LABELS intersection)
# face - quadrilateral # face - quadrilateral
frackit_add_test(NAME test_quad_face_intersection frackit_register_test(NAME test_quad_face_intersection
SOURCES test_quad_face_intersection.cc SOURCES test_quad_face_intersection.cc
LABELS intersection) LABELS intersection)
# face - face # face - face
frackit_add_test(NAME test_face_face_intersection frackit_register_test(NAME test_face_face_intersection
SOURCES test_face_face_intersection.cc SOURCES test_face_face_intersection.cc
LABELS intersection) LABELS intersection)
# cpu time measurement # cpu time measurement
frackit_add_test(NAME test_intersectiontimemeasure frackit_register_test(NAME test_intersectiontimemeasure
SOURCES test_intersectiontimemeasure.cc SOURCES test_intersectiontimemeasure.cc
LABELS intersection) LABELS intersection)
# test write of networks to gmsh output format # test write of networks to gmsh output format
frackit_add_test(NAME test_write_gmsh frackit_register_test(NAME test_write_gmsh
SOURCES test_write_gmsh.cc SOURCES test_write_gmsh.cc
LABELS io gmsh) LABELS io gmsh)
# test for length/area/volume computations # test for length/area/volume computations
frackit_add_test(NAME test_magnitude SOURCES test_magnitude.cc LABELS magnitude) frackit_register_test(NAME test_magnitude SOURCES test_magnitude.cc LABELS magnitude)
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# test random geometry generation # # test random geometry generation #
################################### ###################################
frackit_add_test(NAME test_status SOURCES test_status.cc LABELS sampling) frackit_register_test(NAME test_status SOURCES test_status.cc LABELS sampling)
frackit_add_test(NAME test_pointsampling SOURCES test_pointsampling.cc LABELS sampling) frackit_register_test(NAME test_pointsampling SOURCES test_pointsampling.cc LABELS sampling)
frackit_add_test(NAME test_disksampling SOURCES test_disksampling.cc LABELS sampling) frackit_register_test(NAME test_disksampling SOURCES test_disksampling.cc LABELS sampling)
frackit_add_test(NAME test_quadrilateralsampling SOURCES test_quadrilateralsampling.cc LABELS sampling) frackit_register_test(NAME test_quadrilateralsampling SOURCES test_quadrilateralsampling.cc LABELS sampling)
frackit_add_test(NAME test_polygonsampling SOURCES test_polygonsampling.cc LABELS sampling) frackit_register_test(NAME test_polygonsampling SOURCES test_polygonsampling.cc LABELS sampling)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment