From 79443fdbe5c4327750ba8c0db2258b44c75a05b5 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 4 Oct 2013 14:22:33 +0200
Subject: [PATCH] Move specctra.cpp, specctra_import.cpp and
 specctra_keywords.cpp compilation to pcbcommon lib because they containt
 functions used by the 3D viewer in Cvpcb and Pcbnew.

---
 common/CMakeLists.txt | 14 ++++++++++++++
 cvpcb/CMakeLists.txt  |  3 ---
 pcbnew/CMakeLists.txt |  6 +++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index e2fa10f651..cf1b84f0d6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -139,6 +139,9 @@ set(PCB_COMMON_SRCS
     ../pcbnew/kicad_plugin.cpp
     ../pcbnew/gpcb_plugin.cpp
     ../pcbnew/pcb_netlist.cpp
+    ../pcbnew/specctra.cpp
+    ../pcbnew/specctra_import.cpp
+    ../pcbnew/specctra_keywords.cpp
     pcb_plot_params_keywords.cpp
     pcb_keywords.cpp
     ../pcbnew/pcb_parser.cpp
@@ -155,6 +158,17 @@ set_source_files_properties( ${PCB_COMMON_SRCS} PROPERTIES
 
 add_library(pcbcommon STATIC ${PCB_COMMON_SRCS})
 
+# auto-generate specctra_lexer.h and specctra_keywords.cpp
+make_lexer(
+    ${PROJECT_SOURCE_DIR}/pcbnew/specctra.keywords
+    ${PROJECT_SOURCE_DIR}/pcbnew/specctra_lexer.h
+    ${PROJECT_SOURCE_DIR}/pcbnew/specctra_keywords.cpp
+    DSN
+
+    # Pass header file with dependency on *_lexer.h as extra_arg
+    specctra.h
+    )
+
 # auto-generate netlist_lexer.h and netlist_keywords.cpp
 make_lexer(
     ${CMAKE_CURRENT_SOURCE_DIR}/netlist.keywords
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 79df3b11de..f3f0bf7822 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -31,9 +31,6 @@ set( CVPCB_SRCS
     ../common/base_units.cpp
     ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/class_drc_item.cpp
-    ../pcbnew/specctra.cpp
-    ../pcbnew/specctra_export.cpp
-    ../pcbnew/specctra_keywords.cpp
     autosel.cpp
     cfg.cpp
     class_components_listbox.cpp
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 7e6909b7bd..8d69a77476 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -199,10 +199,10 @@ set( PCBNEW_CLASS_SRCS
     print_board_functions.cpp
     printout_controler.cpp
     ratsnest.cpp
-    specctra.cpp
-    specctra_export.cpp
+#    specctra.cpp           #moved in pcb_common lib
+#    specctra_export.cpp
+#    specctra_keywords.cpp
     specctra_import.cpp
-    specctra_keywords.cpp
     swap_layers.cpp
     target_edit.cpp
     tool_modedit.cpp