From 2134e7de047153b354b415f26fc7022f8f981a84 Mon Sep 17 00:00:00 2001
From: Camille Delbegue <camille.delbegue@gmail.com>
Date: Mon, 5 Aug 2013 17:53:13 +0200
Subject: [PATCH] Remove a Clang warning and add a missing dependency to boost
 in cmake file.

---
 CMakeLists.txt             | 1 +
 common/gal/stroke_font.cpp | 4 ++++
 include/gal/stroke_font.h  | 2 +-
 pcbnew/pcb_painter.cpp     | 4 ++++
 pcbnew/pcb_painter.h       | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8962b3c38..3359c1d918 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,6 +403,7 @@ add_subdirectory(tools)
 add_dependencies( pcbnew boost )
 add_dependencies( eeschema boost )
 add_dependencies( cvpcb boost )
+add_dependencies( gal boost )
 add_dependencies( common boost )
 add_dependencies( pcbcommon boost )
 add_dependencies( 3d-viewer boost )
diff --git a/common/gal/stroke_font.cpp b/common/gal/stroke_font.cpp
index 527b9d5122..242a9f7125 100644
--- a/common/gal/stroke_font.cpp
+++ b/common/gal/stroke_font.cpp
@@ -29,6 +29,10 @@
 
 using namespace KiGfx;
 
+
+const double STROKE_FONT::LINE_HEIGHT_RATIO  = 1.6;
+
+
 STROKE_FONT::STROKE_FONT( GAL* aGal ) :
     m_gal( aGal ),
     m_bold( false ),
diff --git a/include/gal/stroke_font.h b/include/gal/stroke_font.h
index 7c58730d11..7af3b618cb 100644
--- a/include/gal/stroke_font.h
+++ b/include/gal/stroke_font.h
@@ -182,7 +182,7 @@ private:
      */
     VECTOR2D computeTextSize( const std::string& aText ) const;
 
-    static const double LINE_HEIGHT_RATIO  = 1.6;
+    static const double LINE_HEIGHT_RATIO;
 };
 } // namespace KiGfx
 
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index f86be7a190..7c206cea8c 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -43,6 +43,10 @@
 
 using namespace KiGfx;
 
+
+const double PCB_RENDER_SETTINGS::MAX_FONT_SIZE = 100000000;
+
+
 PCB_RENDER_SETTINGS::PCB_RENDER_SETTINGS()
 {
     // By default everything should be displayed as filled
diff --git a/pcbnew/pcb_painter.h b/pcbnew/pcb_painter.h
index 50740889ef..5f0e4fe39b 100644
--- a/pcbnew/pcb_painter.h
+++ b/pcbnew/pcb_painter.h
@@ -106,7 +106,7 @@ protected:
     bool    m_netNamesOnPads;
     bool    m_netNamesOnTracks;
 
-    static const double MAX_FONT_SIZE = 100000000;
+    static const double MAX_FONT_SIZE;
 
     DisplayZonesMode m_displayZoneMode;
 };