kicad-developers team mailing list archive

[John Beard <john.j.beard@xxxxxxxxx>]

Hi Seth,

The revert commit (8f11a2133efd95526d1a3783dbaca76f732b8efb) also
killed the CMake add_subdirectory (because the original commit was
conflicted). Here is a patch to put it back in order (and put the
existing subdirs into some order).

Cheers,

John

On Mon, Jan 7, 2019 at 12:20 AM Seth Hillbrand <seth@xxxxxxxxxxxxx> wrote:
>
> Am 2019-01-06 15:14, schrieb John Beard:
> > Hi,
> >
> > I'm not quite sure what happened here, but patch 0001 in the top email
> > hasn't been applied, but instead the RFC patch for the combined
> > utilities tool program has been applied (now commit 502306) instead.
>
> Ugh.  Sorry all!  I clearly mixed up the commits.  Should be fixed now.
>
> -Seth

From 66c1cb2d4458d8fa3d86e540a5cb6c29055bade3 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@xxxxxxxxx>
Date: Mon, 7 Jan 2019 11:11:47 +0000
Subject: [PATCH] QA: Add pcbnew unit tests CMake subdir

This was accidentally removed with the reversion of the application
of the wrong patch (8f11a2133).
---
 qa/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index fd592f321..e0011ff77 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -12,13 +12,18 @@ if( KICAD_SCRIPTING_MODULES )
 
 endif()
 
-# common QA helpers
+# Shared QA helper libraries
 add_subdirectory( qa_utils )
 add_subdirectory( unit_test_utils )
 
+# Unit tests
 add_subdirectory( common )
+add_subdirectory( pcbnew )
 add_subdirectory( shape_poly_set_refactor )
+
+# Utility/test programs
 add_subdirectory( pcb_parse_input )
+
 # add_subdirectory( pcb_test_window )
 # add_subdirectory( polygon_triangulation )
 # add_subdirectory( polygon_generator )
-- 
2.20.1