Commit cbea44a6 authored by f3nix's avatar f3nix
Browse files

* Fix CMake build. 

* Add polygon library.
parent e126042b

3d-viewer/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line 
ADD_DEFINITIONS(-DPCBNEW)



INCLUDE_DIRECTORIES(../pcbnew ../polygon)

INCLUDE_DIRECTORIES(

	../pcbnew

	../polygon)



SET(3D-VIEWER_SRCS

	3d_aux.cpp

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ IF(wxWidgets_FOUND) 
	ADD_SUBDIRECTORY(gerbview)

	ADD_SUBDIRECTORY(kicad)

	ADD_SUBDIRECTORY(pcbnew)

	ADD_SUBDIRECTORY(polygon)

ELSE(wxWidgets_FOUND)

	# For convenience. When we cannot continue, inform the user.

	MESSAGE(STATUS "Check for installed wxWidgets -- not found")

cvpcb/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ INCLUDE_DIRECTORIES( 
	${CMAKE_CURRENT_SOURCE_DIR}

	bitmaps

	../3d-viewer

	../polygon

	../pcbnew)

	../pcbnew

	../polygon)



SET(CVPCB_SRCS

	autosel.cpp
@@ -36,7 +36,6 @@ SET(CVPCB_SRCS 
SET(CVPCB_EXTRA_SRCS

	../pcbnew/basepcbframe.cpp

	../pcbnew/class_board.cpp

	../pcbnew/class_zone.cpp

	../pcbnew/class_cotation.cpp

	../pcbnew/class_edge_mod.cpp

	../pcbnew/class_equipot.cpp
@@ -46,6 +45,7 @@ SET(CVPCB_EXTRA_SRCS 
	../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
@@ -74,6 +74,6 @@ ENDIF(APPLE) 


ADD_EXECUTABLE(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVPCB_RESOURCES})



TARGET_LINK_LIBRARIES(cvpcb common 3d-viewer ${wxWidgets_LIBRARIES})

TARGET_LINK_LIBRARIES(cvpcb common 3d-viewer polygon ${wxWidgets_LIBRARIES})



INSTALL(TARGETS cvpcb RUNTIME DESTINATION ${KICAD_BIN})

gerbview/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ SET(GERBVIEW_SRCS 
SET(GERBVIEW_EXTRA_SRCS

	../pcbnew/basepcbframe.cpp

	../pcbnew/class_board.cpp

	../pcbnew/class_zone.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
@@ -76,6 +76,6 @@ ENDIF(APPLE) 


ADD_EXECUTABLE(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})



TARGET_LINK_LIBRARIES(gerbview common 3d-viewer lib_polygon ${wxWidgets_LIBRARIES})

TARGET_LINK_LIBRARIES(gerbview common 3d-viewer polygon ${wxWidgets_LIBRARIES})



INSTALL(TARGETS gerbview RUNTIME DESTINATION ${KICAD_BIN})

pcbnew/CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ SET(PCBNEW_SRCS 
	)



SET(PCBNEW_EXTRA_SRCS

#	../polygon/PolyLine.cpp



	../share/drawframe.cpp

	../share/drawpanel.cpp

	../share/infospgm.cpp
@@ -176,6 +174,6 @@ ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp) 
TARGET_LINK_LIBRARIES(specctra_test common ${wxWidgets_LIBRARIES})





TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer ${wxWidgets_LIBRARIES})

TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer polygon ${wxWidgets_LIBRARIES})



INSTALL(TARGETS pcbnew RUNTIME DESTINATION ${KICAD_BIN})