CMake:

* Change tabs to spaces.
* Make Boost required.

3d-viewer/CMakeLists.txt

@@ -1,17 +1,17 @@
 ADD_DEFINITIONS(-DPCBNEW)
 
 INCLUDE_DIRECTORIES(
-	../pcbnew
-	../polygon)
+    ../pcbnew
+    ../polygon)
 
 SET(3D-VIEWER_SRCS
-	3d_aux.cpp
-	3d_canvas.cpp
-	3d_class.cpp
-	3d_draw.cpp
-	3d_frame.cpp
-	3d_read_mesh.cpp
-	3d_toolbar.cpp
-	trackball.cpp)
+    3d_aux.cpp
+    3d_canvas.cpp
+    3d_class.cpp
+    3d_draw.cpp
+    3d_frame.cpp
+    3d_read_mesh.cpp
+    3d_toolbar.cpp
+    trackball.cpp)
 
 ADD_LIBRARY(3d-viewer ${3D-VIEWER_SRCS})

CMakeLists.txt

@@ -46,53 +46,61 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
 
 # Locations for install targets.
 IF(UNIX)
-	IF(APPLE)
-	ELSE(APPLE)
-	# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-	SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
-	# When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-	SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
-	SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
-	SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
-	SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
-	SET(KICAD_MODULES ${KICAD_DATA}/modules)
-	SET(KICAD_LIBRARY ${KICAD_DATA}/library)
-	SET(KICAD_INTERNAT ${KICAD_DATA}/internat)
-	SET(KICAD_TEMPLATE ${KICAD_DATA}/template)
-	ENDIF(APPLE)
+    IF(APPLE)
+    ELSE(APPLE)
+        # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
+        SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
+        # When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
+        SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
+        SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
+        SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
+        SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
+        SET(KICAD_MODULES ${KICAD_DATA}/modules)
+        SET(KICAD_LIBRARY ${KICAD_DATA}/library)
+        SET(KICAD_INTERNAT ${KICAD_DATA}/internat)
+        SET(KICAD_TEMPLATE ${KICAD_DATA}/template)
+    ENDIF(APPLE)
 ENDIF(UNIX)
 
 IF(WIN32)
-	# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-	SET(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
-	# When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-	SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
-	SET(KICAD_PLUGINS ${KICAD_BIN}/plugins)
-	SET(KICAD_DOCS help)
-	SET(KICAD_MODULES modules)
-	SET(KICAD_LIBRARY library)
-	SET(KICAD_INTERNAT internat)
-	SET(KICAD_TEMPLATE template)
+    # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
+    SET(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
+    # When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
+    SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
+    SET(KICAD_PLUGINS ${KICAD_BIN}/plugins)
+    SET(KICAD_DOCS help)
+    SET(KICAD_MODULES modules)
+    SET(KICAD_LIBRARY library)
+    SET(KICAD_INTERNAT internat)
+    SET(KICAD_TEMPLATE template)
 ENDIF(WIN32)
 
 FIND_PACKAGE(OpenGL)
 IF(OPENGL_FOUND)
-	MESSAGE(STATUS "Check for installed OpenGL -- found")
+    MESSAGE(STATUS "Check for installed OpenGL -- found")
 ELSE(OPENGL_FOUND)
-	MESSAGE(STATUS "Check for installed OpenGL -- not found")
-	MESSAGE(FATAL_ERROR "OpenGL was not found - it is required to build KiCad")
+    MESSAGE(STATUS "Check for installed OpenGL -- not found")
+    MESSAGE(FATAL_ERROR "OpenGL was not found - it is required to build KiCad")
 ENDIF(OPENGL_FOUND)
 
+FIND_PACKAGE(Boost)
+IF(Boost_FOUND)
+    MESSAGE(STATUS "Check for installed Boost -- found")
+ELSE(Boost_FOUND)
+    MESSAGE(STATUS "Check for installed Boost -- not found")
+    MESSAGE(FATAL_ERROR "Boost was not found - it is required to build KiCad")
+ENDIF(Boost_FOUND)
+
 # Here you can define what libraries of wxWidgets you need for your
 # application. You can figure out what libraries you need here;
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
 SET(wxWidgets_USE_LIBS base core adv gl html net)
 FIND_PACKAGE(wxWidgetsCVS)
 IF(wxWidgets_FOUND)
-	MESSAGE(STATUS "Check for installed wxWidgets -- found")
+    MESSAGE(STATUS "Check for installed wxWidgets -- found")
 ELSE(wxWidgets_FOUND)
-	MESSAGE(STATUS "Check for installed wxWidgets -- not found")
-	MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
+    MESSAGE(STATUS "Check for installed wxWidgets -- not found")
+    MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
 ENDIF(wxWidgets_FOUND)
 
 # Include wxWidgets macros.
@@ -100,8 +108,8 @@ INCLUDE(${wxWidgets_USE_FILE})
 
 # Include paths.
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}/include
-	${CMAKE_CURRENT_SOURCE_DIR}/share)
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/share)
 
 # CMake will look in these dirs for nested 'CMakeLists.txt' files.
 # Binaries.

common/CMakeLists.txt

@@ -1,37 +1,37 @@
 INCLUDE_DIRECTORIES(bitmaps)
 
 SET(COMMON_SRCS
-	base_screen.cpp
-	base_struct.cpp
-	basicframe.cpp
-	bitmaps.cpp
-	block_commande.cpp
-	common.cpp
-	common_plot_functions.cpp
-	common_plotHPGL_functions.cpp
-	common_plotPS_functions.cpp
-	confirm.cpp
-	copy_to_clipboard.cpp
-	dcsvg.cpp
-	displlst.cpp
-	drawtxt.cpp
-	edaappl.cpp
-	eda_dde.cpp
-	eda_doc.cpp
-#	edamenu.cpp
-	gestfich.cpp
-	get_component_dialog.cpp
-	gr_basic.cpp
-	hotkeys_basic.cpp
-	msgpanel.cpp
-	projet_config.cpp
-#	pyhandler.cpp
-	selcolor.cpp
-	string.cpp
-	toolbars.cpp
-	trigo.cpp
-	worksheet.cpp
-	wxwineda.cpp
-	infospgm.cpp)
+    base_screen.cpp
+    base_struct.cpp
+    basicframe.cpp
+    bitmaps.cpp
+    block_commande.cpp
+    common.cpp
+    common_plot_functions.cpp
+    common_plotHPGL_functions.cpp
+    common_plotPS_functions.cpp
+    confirm.cpp
+    copy_to_clipboard.cpp
+    dcsvg.cpp
+    displlst.cpp
+    drawtxt.cpp
+    edaappl.cpp
+    eda_dde.cpp
+    eda_doc.cpp
+#   edamenu.cpp
+    gestfich.cpp
+    get_component_dialog.cpp
+    gr_basic.cpp
+    hotkeys_basic.cpp
+    infospgm.cpp
+    msgpanel.cpp
+    projet_config.cpp
+#   pyhandler.cpp
+    selcolor.cpp
+    string.cpp
+    toolbars.cpp
+    trigo.cpp
+    worksheet.cpp
+    wxwineda.cpp)
 
 ADD_LIBRARY(common ${COMMON_SRCS})

cvpcb/CMakeLists.txt

@@ -1,75 +1,75 @@
 ADD_DEFINITIONS(-DCVPCB)
 
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	bitmaps
-	../3d-viewer
-	../pcbnew
-	../polygon)
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    bitmaps
+    ../3d-viewer
+    ../pcbnew
+    ../polygon)
 
 SET(CVPCB_SRCS
-	autosel.cpp
-	cfg.cpp
-	class_cvpcb.cpp
-	cvframe.cpp
-	cvpcb.cpp
-#	dialog_cvpcb_config.cpp
-	dialog_display_options.cpp
-	displayframe.cpp
-	genequiv.cpp
-#	genorcad.cpp
-	init.cpp
-	listboxes.cpp
-	listlib.cpp
-	loadcmp.cpp
-	memoire.cpp
-	menucfg.cpp
-	rdpcad.cpp
-	readschematicnetlist.cpp
-	savecmp.cpp
-	setvisu.cpp
-	tool_cvpcb.cpp
-	viewlnet.cpp
-	viewlogi.cpp
-	writenetlistpcbnew.cpp)
+    autosel.cpp
+    cfg.cpp
+    class_cvpcb.cpp
+    cvframe.cpp
+    cvpcb.cpp
+#   dialog_cvpcb_config.cpp
+    dialog_display_options.cpp
+    displayframe.cpp
+    genequiv.cpp
+#   genorcad.cpp
+    init.cpp
+    listboxes.cpp
+    listlib.cpp
+    loadcmp.cpp
+    memoire.cpp
+    menucfg.cpp
+    rdpcad.cpp
+    readschematicnetlist.cpp
+    savecmp.cpp
+    setvisu.cpp
+    tool_cvpcb.cpp
+    viewlnet.cpp
+    viewlogi.cpp
+    writenetlistpcbnew.cpp)
 
 SET(CVPCB_EXTRA_SRCS
-	../pcbnew/basepcbframe.cpp
-	../pcbnew/class_board.cpp
-	../pcbnew/class_cotation.cpp
-	../pcbnew/class_drawsegment.cpp
-	../pcbnew/class_edge_mod.cpp
-	../pcbnew/class_equipot.cpp
-	../pcbnew/class_mire.cpp
-	../pcbnew/class_module.cpp
-	../pcbnew/class_pad.cpp
-	../pcbnew/class_pcb_text.cpp
-	../pcbnew/class_text_mod.cpp
-	../pcbnew/class_track.cpp
-	../pcbnew/class_zone.cpp
-	../pcbnew/classpcb.cpp
-	../pcbnew/collectors.cpp
-	../pcbnew/ioascii.cpp
-	../pcbnew/tracemod.cpp
+    ../pcbnew/basepcbframe.cpp
+    ../pcbnew/class_board.cpp
+    ../pcbnew/class_cotation.cpp
+    ../pcbnew/class_drawsegment.cpp
+    ../pcbnew/class_edge_mod.cpp
+    ../pcbnew/class_equipot.cpp
+    ../pcbnew/class_mire.cpp
+    ../pcbnew/class_module.cpp
+    ../pcbnew/class_pad.cpp
+    ../pcbnew/class_pcb_text.cpp
+    ../pcbnew/class_text_mod.cpp
+    ../pcbnew/class_track.cpp
+    ../pcbnew/class_zone.cpp
+    ../pcbnew/classpcb.cpp
+    ../pcbnew/collectors.cpp
+    ../pcbnew/ioascii.cpp
+    ../pcbnew/tracemod.cpp
 
-	../share/drawframe.cpp
-	../share/drawpanel.cpp
-	../share/zoom.cpp)
+    ../share/drawframe.cpp
+    ../share/drawpanel.cpp
+    ../share/zoom.cpp)
 
 IF(WIN32)
-	IF(MINGW)
-		# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
-		ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o
-			COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
-					    -i ${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.rc
-					    -o ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
-		SET(CVPCB_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
-	ELSE(MINGW)
-		SET(CVPCB_RESOURCES cvpcb.rc)
-	ENDIF(MINGW)
+    IF(MINGW)
+        # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
+        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+                        -i ${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.rc
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
+        SET(CVPCB_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
+    ELSE(MINGW)
+        SET(CVPCB_RESOURCES cvpcb.rc)
+    ENDIF(MINGW)
 ENDIF(WIN32)
 IF(APPLE)
-	SET(CVPCB_RESOURCES cvpcb.r)
+    SET(CVPCB_RESOURCES cvpcb.r)
 ENDIF(APPLE)
 
 ADD_EXECUTABLE(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVPCB_RESOURCES})

eeschema/CMakeLists.txt

@@ -1,121 +1,121 @@
 ADD_DEFINITIONS(-DEESCHEMA)
 
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	bitmaps)
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    bitmaps)
 
 SET(EESCHEMA_SRCS
-	affiche.cpp
-	annotate.cpp
-#	annotate_dialog.cpp
-	block.cpp
-	block_libedit.cpp
-	busentry.cpp
-	bus-wire-junction.cpp
-	class_hierarchy_sheet.cpp
-	class_screen.cpp
-	class_text-label.cpp
-	cleanup.cpp
-	cmpclass.cpp
-	component_class.cpp
-	controle.cpp
-	cross-probing.cpp
-	dangling_ends.cpp
-	database.cpp
-	delete.cpp
-	delsheet.cpp
-	dialog_build_BOM.cpp
-#	dialog_cmp_graphic_properties.cpp
-	dialog_create_component.cpp
-#	dialog_edit_component_in_lib.cpp
-#	dialog_edit_component_in_schematic.cpp
-#	dialog_edit_label.cpp
-	dialog_eeschema_config.cpp
-	dialog_erc.cpp
-#	dialog_find.cpp
-	dialog_options.cpp
-#	divers.cpp
-	edit_component_in_lib.cpp
-	edit_component_in_schematic.cpp
-	edit_label.cpp
-	eeconfig.cpp
-#	eecreate.cpp
-	eelayer.cpp
-	eelibs_draw_components.cpp
-	eelibs_read_libraryfiles.cpp
-	eeload.cpp
-	eeredraw.cpp
-	eeschema.cpp
-	eestring.cpp
-	erc.cpp
-	files-io.cpp
-	find.cpp
-	getpart.cpp
-	hierarch.cpp
-	hotkeys.cpp
-	libalias.cpp
-	libarch.cpp
-	libclass.cpp
-	libedit.cpp
-	libedit_onleftclick.cpp
-	libedit_onrightclick.cpp
-	libedit_undo_redo.cpp
-	lib_export.cpp
-	libfield.cpp
-	libframe.cpp
-	load_one_schematic_file.cpp
-	locate.cpp
-	menubar.cpp
-	netform.cpp
-	netlist_control.cpp
-	netlist.cpp
-	onleftclick.cpp
-	onrightclick.cpp
-	pinedit.cpp
-#	pinedit-dialog.cpp
-	plot.cpp
-	plothpgl.cpp
-	plotps.cpp
-	priorque.cpp
-	savelib.cpp
-	save_schemas.cpp
-	schedit.cpp
-	schematic_undo_redo.cpp
-	schframe.cpp
-	selpart.cpp
-	sheet.cpp
-	sheetlab.cpp
-	symbdraw.cpp
-	symbedit.cpp
-	symbtext.cpp
-	tool_lib.cpp
-	tool_sch.cpp
-	tool_viewlib.cpp
-	viewlib_frame.cpp
-	viewlibs.cpp)
+    affiche.cpp
+    annotate.cpp
+#   annotate_dialog.cpp
+    block.cpp
+    block_libedit.cpp
+    busentry.cpp
+    bus-wire-junction.cpp
+    class_hierarchy_sheet.cpp
+    class_screen.cpp
+    class_text-label.cpp
+    cleanup.cpp
+    cmpclass.cpp
+    component_class.cpp
+    controle.cpp
+    cross-probing.cpp
+    dangling_ends.cpp
+    database.cpp
+    delete.cpp
+    delsheet.cpp
+    dialog_build_BOM.cpp
+#   dialog_cmp_graphic_properties.cpp
+    dialog_create_component.cpp
+#   dialog_edit_component_in_lib.cpp
+#   dialog_edit_component_in_schematic.cpp
+#   dialog_edit_label.cpp
+    dialog_eeschema_config.cpp
+    dialog_erc.cpp
+#   dialog_find.cpp
+    dialog_options.cpp
+#   divers.cpp
+    edit_component_in_lib.cpp
+    edit_component_in_schematic.cpp
+    edit_label.cpp
+    eeconfig.cpp
+#   eecreate.cpp
+    eelayer.cpp
+    eelibs_draw_components.cpp
+    eelibs_read_libraryfiles.cpp
+    eeload.cpp
+    eeredraw.cpp
+    eeschema.cpp
+    eestring.cpp
+    erc.cpp
+    files-io.cpp
+    find.cpp
+    getpart.cpp
+    hierarch.cpp
+    hotkeys.cpp
+    libalias.cpp
+    libarch.cpp
+    libclass.cpp
+    libedit.cpp
+    libedit_onleftclick.cpp
+    libedit_onrightclick.cpp
+    libedit_undo_redo.cpp
+    lib_export.cpp
+    libfield.cpp
+    libframe.cpp
+    load_one_schematic_file.cpp
+    locate.cpp
+    menubar.cpp
+    netform.cpp
+    netlist_control.cpp
+    netlist.cpp
+    onleftclick.cpp
+    onrightclick.cpp
+    pinedit.cpp
+#   pinedit-dialog.cpp
+    plot.cpp
+    plothpgl.cpp
+    plotps.cpp
+    priorque.cpp
+    savelib.cpp
+    save_schemas.cpp
+    schedit.cpp
+    schematic_undo_redo.cpp
+    schframe.cpp
+    selpart.cpp
+    sheet.cpp
+    sheetlab.cpp
+    symbdraw.cpp
+    symbedit.cpp
+    symbtext.cpp
+    tool_lib.cpp
+    tool_sch.cpp
+    tool_viewlib.cpp
+    viewlib_frame.cpp
+    viewlibs.cpp)
 
 SET(EESCHEMA_EXTRA_SRCS
-	../share/drawframe.cpp
-	../share/drawpanel.cpp
-	../share/setpage.cpp
-	../share/svg_print.cpp
-	../share/wxprint.cpp
-	../share/zoom.cpp)
+    ../share/drawframe.cpp
+    ../share/drawpanel.cpp
+    ../share/setpage.cpp
+    ../share/svg_print.cpp
+    ../share/wxprint.cpp
+    ../share/zoom.cpp)
 
 IF(WIN32)
-	IF(MINGW)
-		# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
-		ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o
-			COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
-					    -i ${CMAKE_CURRENT_SOURCE_DIR}/eeschema.rc
-					    -o ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
-		SET(EESCHEMA_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
-	ELSE(MINGW)
-		SET(EESCHEMA_RESOURCES eeschema.rc)
-	ENDIF(MINGW)
+    IF(MINGW)
+        # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
+        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+                        -i ${CMAKE_CURRENT_SOURCE_DIR}/eeschema.rc
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
+        SET(EESCHEMA_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
+    ELSE(MINGW)
+        SET(EESCHEMA_RESOURCES eeschema.rc)
+    ENDIF(MINGW)
 ENDIF(WIN32)
 IF(APPLE)
-	SET(EESCHEMA_RESOURCES eeschema.r)
+    SET(EESCHEMA_RESOURCES eeschema.r)
 ENDIF(APPLE)
 
 ADD_EXECUTABLE(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES})

eeschema/plugins/CMakeLists.txt

@@ -1,5 +1,5 @@
 IF(UNIX)
-	ADD_DEFINITIONS(-D__UNIX__)
+    ADD_DEFINITIONS(-D__UNIX__)
 ENDIF(UNIX)
 
 ADD_EXECUTABLE(netlist_form_pads-pcb netlist_form_pads-pcb.cpp)

gerbview/CMakeLists.txt

@@ -1,77 +1,77 @@
 ADD_DEFINITIONS(-DGERBVIEW -DPCBNEW)
 
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	../3d-viewer
-	../cvpcb
-	../pcbnew
-	../polygon)
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ../3d-viewer
+    ../cvpcb
+    ../pcbnew
+    ../polygon)
 
 SET(GERBVIEW_SRCS
-	affiche.cpp
-	block.cpp
-	controle.cpp
-	dcode.cpp
-	deltrack.cpp
-	edit.cpp
-	export_to_pcbnew.cpp
-	files.cpp
-	gerberframe.cpp
-	gerbview_config.cpp
-	gerbview.cpp
-	hotkeys.cpp
-	initpcb.cpp
-	lay2plot.cpp
-	locate.cpp
-	onrightclick.cpp
-	options.cpp
-	pcbplot.cpp
-#	pcbtexte.cpp
-#	process_config.cpp
-	readgerb.cpp
+    affiche.cpp
+    block.cpp
+    controle.cpp
+    dcode.cpp
+    deltrack.cpp
+    edit.cpp
+    export_to_pcbnew.cpp
+    files.cpp
+    gerberframe.cpp
+    gerbview_config.cpp
+    gerbview.cpp
+    hotkeys.cpp
+    initpcb.cpp
+    lay2plot.cpp
+    locate.cpp
+    onrightclick.cpp
+    options.cpp
+    pcbplot.cpp
+#   pcbtexte.cpp
+#   process_config.cpp
+    readgerb.cpp
     reglage.cpp
-	rs274d.cpp
-	rs274x.cpp
-	select_layers_to_pcb.cpp
-	set_color.cpp
-	tool_gerber.cpp
-	tracepcb.cpp
-	trpiste.cpp
-	undelete.cpp)
+    rs274d.cpp
+    rs274x.cpp
+    select_layers_to_pcb.cpp
+    set_color.cpp
+    tool_gerber.cpp
+    tracepcb.cpp
+    trpiste.cpp
+    undelete.cpp)
 
 SET(GERBVIEW_EXTRA_SRCS
-	../pcbnew/basepcbframe.cpp
-	../pcbnew/class_board.cpp
-	../pcbnew/class_drawsegment.cpp
-	../pcbnew/class_drc_item.cpp
-	../pcbnew/class_marker.cpp
-	../pcbnew/class_pcb_text.cpp
-	../pcbnew/class_track.cpp
-	../pcbnew/class_zone.cpp
-	../pcbnew/classpcb.cpp
-	../pcbnew/collectors.cpp
-	../pcbnew/sel_layer.cpp
+    ../pcbnew/basepcbframe.cpp
+    ../pcbnew/class_board.cpp
+    ../pcbnew/class_drawsegment.cpp
+    ../pcbnew/class_drc_item.cpp
+    ../pcbnew/class_marker.cpp
+    ../pcbnew/class_pcb_text.cpp
+    ../pcbnew/class_track.cpp
+    ../pcbnew/class_zone.cpp
+    ../pcbnew/classpcb.cpp
+    ../pcbnew/collectors.cpp
+    ../pcbnew/sel_layer.cpp
 
-	../share/drawframe.cpp
-	../share/drawpanel.cpp
-	../share/setpage.cpp
-	../share/wxprint.cpp
-	../share/zoom.cpp)
+    ../share/drawframe.cpp
+    ../share/drawpanel.cpp
+    ../share/setpage.cpp
+    ../share/wxprint.cpp
+    ../share/zoom.cpp)
 
 IF(WIN32)
-	IF(MINGW)
-		# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
-		ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o
-			COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
-					    -i ${CMAKE_CURRENT_SOURCE_DIR}/gerbview.rc
-					    -o ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o)
-		SET(GERBVIEW_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o)
-	ELSE(MINGW)
-		SET(GERBVIEW_RESOURCES gerbview.rc)
-	ENDIF(MINGW)
+    IF(MINGW)
+        # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
+        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
+                        -i ${CMAKE_CURRENT_SOURCE_DIR}/gerbview.rc
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o)
+        SET(GERBVIEW_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/gerbview_rc.o)
+    ELSE(MINGW)
+        SET(GERBVIEW_RESOURCES gerbview.rc)
+    ENDIF(MINGW)
 ENDIF(WIN32)
 IF(APPLE)
-	SET(GERBVIEW_RESOURCES gerbview.r)
+    SET(GERBVIEW_RESOURCES gerbview.r)
 ENDIF(APPLE)
 
 ADD_EXECUTABLE(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})

help/CMakeLists.txt

@@ -1,14 +1,14 @@
 INSTALL(DIRECTORY de COMPONENT doc-de
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY en COMPONENT doc-en
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY es COMPONENT doc-es
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY fr COMPONENT doc-fr
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY it COMPONENT doc-it
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY pt COMPONENT doc-pt
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY ru COMPONENT doc-ru
-	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)

internat/CMakeLists.txt

@@ -1,3 +1,3 @@
 INSTALL(DIRECTORY ca cs de es fr hu it ko pl pt ru sl
-	DESTINATION ${KICAD_INTERNAT} COMPONENT resources
-	PATTERN ".svn" EXCLUDE)
+    DESTINATION ${KICAD_INTERNAT} COMPONENT resources
+    PATTERN ".svn" EXCLUDE)

kicad/CMakeLists.txt

@@ -3,30 +3,30 @@ ADD_DEFINITIONS(-DKICAD)
 INCLUDE_DIRECTORIES(bitmaps)
 
 SET(KICAD_SRCS
-	buildmnu.cpp
-	commandframe.cpp
-	files-io.cpp
-	kicad.cpp
-	mainframe.cpp
-	preferences.cpp
-	prjconfig.cpp
-	treeprj_datas.cpp
-	treeprj_frame.cpp)
+    buildmnu.cpp
+    commandframe.cpp
+    files-io.cpp
+    kicad.cpp
+    mainframe.cpp
+    preferences.cpp
+    prjconfig.cpp
+    treeprj_datas.cpp
+    treeprj_frame.cpp)
 
 IF(WIN32)
-	IF(MINGW)
-		# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
-		ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o
-			COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
-					    -i ${CMAKE_CURRENT_SOURCE_DIR}/kicad.rc
-					    -o ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
-		SET(KICAD_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
-	ELSE(MINGW)
-		SET(KICAD_RESOURCES kicad.rc)
-	ENDIF(MINGW)
+    IF(MINGW)
+        # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
+        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+                        -i ${CMAKE_CURRENT_SOURCE_DIR}/kicad.rc
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
+        SET(KICAD_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
+    ELSE(MINGW)
+        SET(KICAD_RESOURCES kicad.rc)
+    ENDIF(MINGW)
 ENDIF(WIN32)
 IF(APPLE)
-	SET(KICAD_RESOURCES kicad.r)
+    SET(KICAD_RESOURCES kicad.r)
 ENDIF(APPLE)
 
 ADD_EXECUTABLE(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
@@ -36,5 +36,5 @@ TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES})
 INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
 
 IF(KICAD_MINIZIP)
-	ADD_SUBDIRECTORY(minizip)
+    ADD_SUBDIRECTORY(minizip)
 ENDIF(KICAD_MINIZIP)

kicad/minizip/CMakeLists.txt

@@ -1,27 +1,27 @@
 FIND_PACKAGE(ZLIB)
 IF(ZLIB_FOUND)
-	MESSAGE(STATUS "Check for installed ZLIB -- found")
+    MESSAGE(STATUS "Check for installed zlib -- found")
 ELSE(ZLIB_FOUND)
-	MESSAGE(STATUS "Check for installed zlib -- not found")
-    IF (NOT MINGW)
-		MESSAGE(FATAL_ERROR
+    MESSAGE(STATUS "Check for installed zlib -- not found")
+    IF(NOT MINGW)
+        MESSAGE(FATAL_ERROR
                  "zlib was not found - it is required to build KiCad")
-	ELSE (NOT MINGW)
-		# zlib is not installed, and in this case wxWidgets creates its own zlib library
-		# include files are in ${wxWidgets_ROOT_DIR}/src/zlib
-		#and the corresponding library is libwxzlib-<version>.a ( like libwxzlib-2.8.a)
-		# and we try to use it
-		INCLUDE_DIRECTORIES(${wxWidgets_ROOT_DIR}/src/zlib)
-    ENDIF (NOT MINGW)
+    ELSE(NOT MINGW)
+        # zlib is not installed, and in this case wxWidgets creates its own zlib library
+        # include files are in ${wxWidgets_ROOT_DIR}/src/zlib
+        # and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
+        # and we try to use it
+        INCLUDE_DIRECTORIES(${wxWidgets_ROOT_DIR}/src/zlib)
+    ENDIF(NOT MINGW)
 ENDIF(ZLIB_FOUND)
 
 SET(MINIZIP_SRCS
-	ioapi.c
-	minizip.c
-	zip.c)
+    ioapi.c
+    minizip.c
+    zip.c)
 
-ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
+ADD_EXECUTABLE(minizip ${MINIZIP_SRCS})
 
-TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES}  ${wxWidgets_LIBRARIES})
+TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES} ${wxWidgets_LIBRARIES})
 
 INSTALL(TARGETS minizip RUNTIME DESTINATION bin COMPONENT binary)

modules/CMakeLists.txt

@@ -9,4 +9,4 @@ INSTALL(FILES ${mdc_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
 INSTALL(FILES ${mod_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
 
 INSTALL(DIRECTORY packages3d DESTINATION ${KICAD_MODULES} COMPONENT resources
-	PATTERN ".svn" EXCLUDE)
+    PATTERN ".svn" EXCLUDE)

pcbnew/CMakeLists.txt

@@ -1,7 +1,5 @@
 ADD_DEFINITIONS(-DPCBNEW)
 
-FIND_PACKAGE(Boost)
-
 INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${Boost_INCLUDE_DIR}
@@ -172,7 +170,7 @@ ADD_EXECUTABLE(dsntest EXCLUDE_FROM_ALL dsn.cpp)
 TARGET_LINK_LIBRARIES(dsntest common ${wxWidgets_LIBRARIES})
 
 # This one gets made only when testing.
-ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp dsn.cpp )
+ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp dsn.cpp)
 TARGET_LINK_LIBRARIES(specctra_test common ${wxWidgets_LIBRARIES})
 
 

polygon/CMakeLists.txt

@@ -1,8 +1,8 @@
 SET(POLYGON_SRCS
-	GenericPolygonClipperLibrary.cpp
-	math_for_graphics.cpp
-	php_polygon.cpp
-	php_polygon_vertex.cpp
-	PolyLine.cpp)
+    GenericPolygonClipperLibrary.cpp
+    math_for_graphics.cpp
+    php_polygon.cpp
+    php_polygon_vertex.cpp
+    PolyLine.cpp)
 
 ADD_LIBRARY(polygon ${POLYGON_SRCS})

template/CMakeLists.txt

@@ -1,2 +1,2 @@
 INSTALL(FILES kicad.pro
-	DESTINATION ${KICAD_TEMPLATE} COMPONENT resources)
+    DESTINATION ${KICAD_TEMPLATE} COMPONENT resources)