haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QA: Add pcbnew unit tests CMake subdir 

Also modify the linkage of kiface objects, as this is not
supported by older CMake versions.

This was accidentally removed with the reversion of the application
of the wrong patch (8f11a2133).

QA: fix object files
This commit is contained in:
John Beard 2019-01-07 11:11:47 +00:00 committed by jean-pierre charras
parent 3f9230fa51
commit 1ae6fc78a6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/CMakeLists.txt
View File

@ -12,13 +12,18 @@ if( KICAD_SCRIPTING_MODULES )
endif() endif()
# common QA helpers # Shared QA helper libraries
add_subdirectory( qa_utils ) add_subdirectory( qa_utils )
add_subdirectory( unit_test_utils ) add_subdirectory( unit_test_utils )
# Unit tests
add_subdirectory( common ) add_subdirectory( common )
add_subdirectory( pcbnew )
add_subdirectory( shape_poly_set_refactor ) add_subdirectory( shape_poly_set_refactor )
# Utility/test programs
add_subdirectory( pcb_parse_input ) add_subdirectory( pcb_parse_input )
# add_subdirectory( pcb_test_window ) # add_subdirectory( pcb_test_window )
# add_subdirectory( polygon_triangulation ) # add_subdirectory( polygon_triangulation )
# add_subdirectory( polygon_generator ) # add_subdirectory( polygon_generator )

5
qa/pcbnew/CMakeLists.txt
View File

@ -36,6 +36,10 @@ add_executable( qa_pcbnew
test_graphics_import_mgr.cpp test_graphics_import_mgr.cpp
test_pad_naming.cpp test_pad_naming.cpp
# Older CMakes cannot link OBJECT libraries
# https://cmake.org/pipermail/cmake/2013-November/056263.html
$<TARGET_OBJECTS:pcbnew_kiface_objects>
) )
if( BUILD_GITHUB_PLUGIN ) if( BUILD_GITHUB_PLUGIN )
@ -73,7 +77,6 @@ target_link_libraries( qa_pcbnew
qa_utils qa_utils
lib_dxf lib_dxf
idf3 idf3
pcbnew_kiface_objects
unit_test_utils unit_test_utils
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GITHUB_PLUGIN_LIBRARIES} ${GITHUB_PLUGIN_LIBRARIES}