songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a compilation_test for demo_framework in the Polyhedorn_Demo and make everythink else depend on it, to try and fix the truncated file errors in the testsuite

This commit is contained in:
Maxime Gimeno 2019-08-14 13:02:49 +02:00
parent 92b6a98e43
commit a4b171d77f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -192,6 +192,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND )
target_link_libraries(demo_framework target_link_libraries(demo_framework
PUBLIC Qt5::OpenGL Qt5::Widgets Qt5::Gui Qt5::Script PUBLIC Qt5::OpenGL Qt5::Widgets Qt5::Gui Qt5::Script
) )
cgal_add_compilation_test(demo_framework)
# Let's define `three_EXPORT` during the compilation of `demo_framework`, # Let's define `three_EXPORT` during the compilation of `demo_framework`,
# in addition of `demo_framework_EXPORT` (defined automatically by # in addition of `demo_framework_EXPORT` (defined automatically by
# CMake). That is to deal with the visibility of symbols of # CMake). That is to deal with the visibility of symbols of
@ -226,6 +227,11 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND )
PUBLIC demo_framework ${CGAL_LIBRARIES} PUBLIC demo_framework ${CGAL_LIBRARIES}
Qt5::OpenGL Qt5::Gui Qt5::Script Qt5::Widgets) Qt5::OpenGL Qt5::Gui Qt5::Script Qt5::Widgets)
cgal_add_compilation_test(${item_name}) cgal_add_compilation_test(${item_name})
if(BUILD_TESTING)
set_tests_properties(
compilation_of__${item_name}
PROPERTIES DEPENDS compilation__of_demo_framework)
endif()
endmacro(add_item) endmacro(add_item)
add_item(scene_c3t3_item Scene_c3t3_item.cpp) add_item(scene_c3t3_item Scene_c3t3_item.cpp)

6
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
View File

@ -27,7 +27,11 @@ include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
PROPERTY LIBRARY_OUTPUT_DIRECTORY PROPERTY LIBRARY_OUTPUT_DIRECTORY
"${CGAL_POLYHEDRON_DEMO_PLUGINS_DIR}") "${CGAL_POLYHEDRON_DEMO_PLUGINS_DIR}")
cgal_add_compilation_test(${plugin_name}) cgal_add_compilation_test(${plugin_name})
if(BUILD_TESTING)
set_tests_properties(
compilation_of__${plugin_name}
PROPERTIES DEPENDS compilation__of_demo_framework)
endif()
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${plugin_name} ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${plugin_name} )
# Link with Qt # Link with Qt
target_link_libraries( ${plugin_name} PUBLIC ${QT_LIBRARIES} ) target_link_libraries( ${plugin_name} PUBLIC ${QT_LIBRARIES} )