switch to <> for includes from "" per conversation with Jean-Pierre and Wayne, adjust search paths

3d-viewer/3d_aux.cpp

@@ -27,25 +27,25 @@
  * @file 3d_aux.cpp
  */
 
-#include "fctsys.h"
+#include <fctsys.h>
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "common.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
+#include <common.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
 
-#include "class_board_design_settings.h"
-#include "class_zone.h"
-#include "class_text_mod.h"
-#include "class_module.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
+#include <class_board_design_settings.h>
+#include <class_zone.h>
+#include <class_text_mod.h>
+#include <class_module.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
 
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
 
 
 void S3D_MASTER::Set_Object_Coords( std::vector< S3D_Vertex >& aVertices )

3d-viewer/3d_canvas.cpp

@@ -1,23 +1,23 @@
 /**
  * @file 3d_canvas.cpp
 */
-#include "fctsys.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <trigo.h>
 
-#include "wx/image.h"
+#include <wx/image.h>
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "wx/dataobj.h"
-#include "wx/clipbrd.h"
+#include <wx/dataobj.h>
+#include <wx/clipbrd.h>
 #include <wx/wupdlock.h>
 
-#include "gestfich.h"
+#include <gestfich.h>
 
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
 
 
 // -----------------

3d-viewer/3d_class.cpp

@@ -2,9 +2,9 @@
 // Name:        3d_class.cpp
 /////////////////////////////////////////////////////////////////////////////
 
-#include "fctsys.h"
+#include <fctsys.h>
 
-#include "3d_viewer.h"
+#include <3d_viewer.h>
 
 
 S3D_Vertex::S3D_Vertex()

3d-viewer/3d_draw.cpp

@@ -27,27 +27,27 @@
  * @file 3d_draw.cpp
 */
 
-#include "fctsys.h"
-#include "common.h"
-#include "trigo.h"
-#include "pcbstruct.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "layers_id_colors_and_visibility.h"
+#include <fctsys.h>
+#include <common.h>
+#include <trigo.h>
+#include <pcbstruct.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <layers_id_colors_and_visibility.h>
 
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
-#include "class_zone.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_board_design_settings.h"
-#include "class_marker_pcb.h"
-#include "colors_selection.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
+#include <class_zone.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_board_design_settings.h>
+#include <class_marker_pcb.h>
+#include <colors_selection.h>
 
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.

3d-viewer/3d_frame.cpp

@@ -2,15 +2,15 @@
 // Name:        3d_frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 
-#include "fctsys.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
 
 #include <wx/colordlg.h>
 #include <wxstruct.h>

3d-viewer/3d_read_mesh.cpp

@@ -27,13 +27,13 @@
  * @file 3d_read_mesh.cpp
  */
 
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <appl_wxstruct.h>
 
-#include "3d_viewer.h"
+#include <3d_viewer.h>
 
 
 int S3D_MASTER::ReadData()

3d-viewer/3d_struct.h

@@ -30,8 +30,8 @@
 #ifndef STRUCT_3D_H
 #define STRUCT_3D_H
 
-#include "common.h"
-#include "base_struct.h"
+#include <common.h>
+#include <base_struct.h>
 
 
 /* 3D modeling units -> PCB units conversion scale:

3d-viewer/3d_toolbar.cpp

@@ -27,9 +27,9 @@
  * @file 3d_toolbar.cpp
  */
 
-#include "fctsys.h"
+#include <fctsys.h>
 
-#include "3d_viewer.h"
+#include <3d_viewer.h>
 
 
 void EDA_3D_FRAME::ReCreateHToolbar()

3d-viewer/3d_viewer.h

@@ -30,14 +30,14 @@
 #ifndef __3D_VIEWER_H__
 #define __3D_VIEWER_H__
 
-#include "wxBasePcbFrame.h"        // m_auimanager member.
+#include <wxBasePcbFrame.h>        // m_auimanager member.
 
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "wx/glcanvas.h"
+#include <wx/glcanvas.h>
 
 #ifdef __WXMAC__
 #  ifdef __DARWIN__
@@ -49,8 +49,8 @@
 #  include <GL/glu.h>
 #endif
 
-#include "3d_struct.h"
-#include "id.h"
+#include <3d_struct.h>
+#include <id.h>
 
 
 class BOARD_DESIGN_SETTINGS;

3d-viewer/CMakeLists.txt

@@ -1,8 +1,12 @@
 add_definitions(-DPCBNEW)
 
-include_directories(${Boost_INCLUDE_DIR}
-                    ../pcbnew
-                    ../polygon)
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+    ${Boost_INCLUDE_DIR}
+    ../pcbnew
+    ../polygon
+    ${INC_AFTER}
+    )
 
 set(3D-VIEWER_SRCS
     3d_aux.cpp
@@ -12,6 +16,7 @@ set(3D-VIEWER_SRCS
     3d_frame.cpp
     3d_read_mesh.cpp
     3d_toolbar.cpp
-    trackball.cpp)
+    trackball.cpp
+    )
 
 add_library(3d-viewer ${3D-VIEWER_SRCS})

3d-viewer/trackball.cpp

@@ -50,8 +50,8 @@
  * Gavin Bell
  */
 #include <math.h>
-#include "wx/glcanvas.h"     // used only to define GLfloat
-#include "trackball.h"
+#include <wx/glcanvas.h>     // used only to define GLfloat
+#include <trackball.h>
 
 /*
  * This size should really be based on the distance from the center of

CMakeLists.txt

@@ -229,12 +229,20 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
     add_definitions(-DHAVE_SVN_REVISION)
 endif(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
 
+# For include_directories(BEFORE ...), which _reverses_
+# the order during insertion, so put first wanted last, which is
+# ${CMAKE_SOURCE_DIR/include.  Use '.' for current source dir since
+# we don't want expansion here and now, and don't need expansion of
+# ${CMAKE_CURRENT_SOURCE_DIR}, '.' will work for any source directory.
+set(INC_BEFORE
+    .
+    ${CMAKE_SOURCE_DIR}/include
+    )
 
-# Include paths.
-include_directories(${CMAKE_SOURCE_DIR}/include
-                    ${CMAKE_SOURCE_DIR}/share
-                    ${CMAKE_BINARY_DIR})
-
+set(INC_AFTER
+    #include <config.h>
+    ${CMAKE_BINARY_DIR}
+    )
 
 #================================================
 # Let CMake look in these directories for nested
@@ -252,6 +260,7 @@ else()
     add_subdirectory(bitmaps_xpm)
 endif()
 
+
 add_subdirectory(common)
 add_subdirectory(cvpcb)
 add_subdirectory(eeschema)

CMakeModules/PNG2cpp.cmake

@@ -47,7 +47,7 @@ set( output_begin "
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include \"bitmaps.h\"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {"
 )

CMakeModules/TokenList2DsnLexer.cmake

@@ -104,7 +104,7 @@ set( includeFileHeader
 #ifndef ${headerTag}
 #define ${headerTag}
 
-#include \"dsnlexer.h\"
+#include <dsnlexer.h>
 
 /**
  * C++ does not put enum _values_ in separate namespaces unless the enum itself
@@ -150,7 +150,7 @@ set( sourceFileHeader
  * your DSN lexer.
  */
 
-#include \"${result}_lexer.h\"
+#include <${result}_lexer.h>
 
 using namespace ${enum};
 

bitmap2component/CMakeLists.txt

@@ -1,8 +1,11 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ../potrace
-                    ../polygon/kbool/include
-                    ${CMAKE_SOURCE_DIR}/common
-                    )
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+    ../potrace
+    ../polygon/kbool/include
+    ../common
+    ${INC_AFTER}
+    )
 
 set(BITMAP2COMPONENT_SRCS
     bitmap2component.cpp

bitmap2component/bitmap2cmp_gui.cpp

@@ -21,23 +21,23 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
 
-#include "wx/wx.h"
-#include "wx/config.h"
-#include "wx/filename.h"
+#include <wx/wx.h>
+#include <wx/config.h>
+#include <wx/filename.h>
 
-#include "bitmap2cmp_gui_base.h"
+#include <bitmap2cmp_gui_base.h>
 
-#include "potracelib.h"
-#include "bitmap_io.h"
+#include <potracelib.h>
+#include <bitmap_io.h>
 
-#include "colors_selection.h"
-#include "build_version.h"
+#include <colors_selection.h>
+#include <build_version.h>
 
 #define KEYWORD_FRAME_POSX wxT( "Bmconverter_Pos_x" )
 #define KEYWORD_FRAME_POSY wxT( "Bmconverter_Pos_y" )
@@ -81,8 +81,8 @@ private:
     void OnExportEeschema( wxCommandEvent& event );
     void OnExportPcbnew( wxCommandEvent& event );
     void Binarize( double aThreshold );     // aThreshold = 0.0 (black level) to 1.0 (white level)
-	void OnOptionsSelection( wxCommandEvent& event );
-	void OnThresholdChange( wxScrollEvent& event );
+    void OnOptionsSelection( wxCommandEvent& event );
+    void OnThresholdChange( wxScrollEvent& event );
     void NegateGreyscaleImage( );
     void ExportFile( FILE* aOutfile, int aFormat );
 };
@@ -113,8 +113,8 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
 
     SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
 
-	m_buttonExportEeschema->Enable( false );
-	m_buttonExportPcbnew->Enable( false );
+    m_buttonExportEeschema->Enable( false );
+    m_buttonExportPcbnew->Enable( false );
 
     if ( m_FramePos == wxDefaultPosition )
         Centre();
@@ -197,8 +197,8 @@ void BM2CMP_FRAME::OnLoadFile( wxCommandEvent& event )
     if( ! LoadFile( fullFilename ) )
         return;
 
-	m_buttonExportEeschema->Enable( true );
-	m_buttonExportPcbnew->Enable( true );
+    m_buttonExportEeschema->Enable( true );
+    m_buttonExportPcbnew->Enable( true );
     SetStatusText( fullFilename );
     Refresh();
 }

bitmap2component/bitmap2component.cpp

@@ -24,7 +24,7 @@
 #include <math.h>
 
 // For some unknown reasons, polygon.hpp shoul be included first
-#include "boost/polygon/polygon.hpp"
+#include <boost/polygon/polygon.hpp>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,8 +33,8 @@
 #include <math.h>
 #include <vector>
 
-#include "potracelib.h"
-#include "auxiliary.h"
+#include <potracelib.h>
+#include <auxiliary.h>
 
 
 #ifndef max

bitmaps_png/CMakeLists.txt

@@ -69,6 +69,10 @@ option( MAINTAIN_PNGS
         "Set to true if you are a PNG maintainer and have the required tools given in the bitmaps_png/CMakeLists.txt file (default OFF)."
         OFF)
 
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+    ${INC_AFTER}
+    )
 
 
 # Plan for three sizes of bitmaps:

bitmaps_png/cpp_16/pinorient_down.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinorient_left.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinorient_right.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinorient_up.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinshape_active_low_input.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinshape_active_low_output.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

bitmaps_png/cpp_16/pinshape_clock_active_low.cpp

@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include "bitmaps.h"
+#include <bitmaps.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,