haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old build configuration since kiway is now the only way to build kicad.

This commit is contained in:
Wayne Stambaugh 2014-10-26 15:54:48 -04:00
parent ad645abac4
commit e273a48ddc
7 changed files with 506 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -23,9 +23,6 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules )
# reports. # reports.
# #
#option( USE_KIWAY_DLLS "Build the major modules as KIFACE DLLs or DSOs, will soon be the norm." ON )
set( USE_KIWAY_DLLS true ) # this is now mandatory, the code is the same anyways, the old code is gone.
# The desire is to migrate designs *away from* case independence, and to create designs which use # The desire is to migrate designs *away from* case independence, and to create designs which use
# literally (case specific) interpreted component names. But for backwards compatibility, # literally (case specific) interpreted component names. But for backwards compatibility,
# you may turn OFF this option if you really must. (Remember that with KiCad using text # you may turn OFF this option if you really must. (Remember that with KiCad using text

50
cvpcb/CMakeLists.txt
View File

@ -68,7 +68,6 @@ if( APPLE )
endif() endif()
if( USE_KIWAY_DLLS )
add_executable( cvpcb WIN32 MACOSX_BUNDLE add_executable( cvpcb WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
../common/pgm_base.cpp ../common/pgm_base.cpp
@ -84,6 +83,7 @@ if( USE_KIWAY_DLLS )
bitmaps bitmaps
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( cvpcb PROPERTIES set_target_properties( cvpcb PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
@ -192,51 +192,3 @@ if( USE_KIWAY_DLLS )
COMPONENT binary COMPONENT binary
) )
endif() endif()
else()
add_executable( cvpcb WIN32 MACOSX_BUNDLE
${CVPCB_SRCS}
${CVPCB_DIALOGS}
${CVPCB_RESOURCES}
)
target_link_libraries( cvpcb
3d-viewer
pcbcommon
pcad2kicadpcb
common
bitmaps
polygon
gal
${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
${PIXMAN_LIBRARY}
)
# Only for win32 cross compilation using MXE
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
target_link_libraries( cvpcb
opengl32
glu32
pixman-1
fontconfig
freetype
bz2
)
endif()
if( BUILD_GITHUB_PLUGIN )
target_link_libraries( cvpcb github_plugin )
endif()
# Must follow github_plugin
target_link_libraries( cvpcb ${Boost_LIBRARIES} )
install( TARGETS cvpcb
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()

30
eeschema/CMakeLists.txt
View File

@ -218,7 +218,6 @@ if( APPLE )
endif() endif()
if( USE_KIWAY_DLLS )
add_executable( eeschema WIN32 MACOSX_BUNDLE add_executable( eeschema WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
../common/pgm_base.cpp ../common/pgm_base.cpp
@ -239,7 +238,6 @@ if( USE_KIWAY_DLLS )
add_library( eeschema_kiface MODULE add_library( eeschema_kiface MODULE
${EESCHEMA_SRCS} ${EESCHEMA_SRCS}
${EESCHEMA_COMMON_SRCS} ${EESCHEMA_COMMON_SRCS}
# ${EESCHEMA_RESOURCES}
) )
target_link_libraries( eeschema_kiface target_link_libraries( eeschema_kiface
common common
@ -315,34 +313,6 @@ if( USE_KIWAY_DLLS )
) )
endif() endif()
else()
add_executable( eeschema WIN32 MACOSX_BUNDLE
../common/single_top.cpp
${EESCHEMA_SRCS}
${EESCHEMA_COMMON_SRCS}
${EESCHEMA_RESOURCES}
)
target_link_libraries( eeschema
common
# lib_kicad
bitmaps
polygon
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
set_source_files_properties( ../common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
)
install( TARGETS eeschema
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()
# auto-generate cmp_library_lexer.h and cmp_library_keywords.cpp for the component # auto-generate cmp_library_lexer.h and cmp_library_keywords.cpp for the component
# library format. # library format.
make_lexer( make_lexer(

28
gerbview/CMakeLists.txt
View File

@ -93,8 +93,6 @@ if( APPLE )
set( MACOSX_BUNDLE_NAME gerbview ) set( MACOSX_BUNDLE_NAME gerbview )
endif() endif()
if( USE_KIWAY_DLLS )
add_executable( gerbview WIN32 MACOSX_BUNDLE add_executable( gerbview WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
../common/pgm_base.cpp ../common/pgm_base.cpp
@ -110,6 +108,7 @@ if( USE_KIWAY_DLLS )
bitmaps bitmaps
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( gerbview PROPERTIES set_target_properties( gerbview PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=gerbview.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=gerbview.map" )
@ -139,6 +138,7 @@ if( USE_KIWAY_DLLS )
# The KIFACE is in gerbview.cpp, export it: # The KIFACE is in gerbview.cpp, export it:
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( gerbview_kiface PROPERTIES set_target_properties( gerbview_kiface PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )
@ -185,27 +185,3 @@ if( USE_KIWAY_DLLS )
COMPONENT binary COMPONENT binary
) )
endif() endif()
else()
add_executable( gerbview WIN32 MACOSX_BUNDLE
gerbview.cpp
${GERBVIEW_SRCS}
${DIALOGS_SRCS}
${GERBVIEW_EXTRA_SRCS}
${GERBVIEW_RESOURCES}
)
target_link_libraries( gerbview
common
polygon
bitmaps
${OPENGL_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
install( TARGETS gerbview
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()

30
pagelayout_editor/CMakeLists.txt
View File

@ -67,9 +67,6 @@ if( APPLE )
set( MACOSX_BUNDLE_NAME pl_editor ) set( MACOSX_BUNDLE_NAME pl_editor )
endif() endif()
if( USE_KIWAY_DLLS )
# a very small program launcher for pl_editor_kiface # a very small program launcher for pl_editor_kiface
add_executable( pl_editor WIN32 MACOSX_BUNDLE add_executable( pl_editor WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
@ -86,6 +83,7 @@ if( USE_KIWAY_DLLS )
bitmaps bitmaps
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pl_editor PROPERTIES set_target_properties( pl_editor PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" )
@ -115,6 +113,7 @@ if( USE_KIWAY_DLLS )
# The KIFACE is in pcbnew.cpp, export it: # The KIFACE is in pcbnew.cpp, export it:
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pl_editor_kiface PROPERTIES set_target_properties( pl_editor_kiface PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )
@ -133,6 +132,7 @@ if( USE_KIWAY_DLLS )
set_target_properties( pl_editor_kiface PROPERTIES set_target_properties( pl_editor_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR} LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
) )
# put individual bundle outside of main bundle as a first step # put individual bundle outside of main bundle as a first step
# will be pulled into the main bundle when creating main bundle # will be pulled into the main bundle when creating main bundle
install( TARGETS pl_editor install( TARGETS pl_editor
@ -161,27 +161,3 @@ if( USE_KIWAY_DLLS )
COMPONENT binary COMPONENT binary
) )
endif() endif()
else()
add_executable( pl_editor WIN32 MACOSX_BUNDLE
pl_editor.cpp
${PL_EDITOR_SRCS}
${DIALOGS_SRCS}
${PL_EDITOR_EXTRA_SRCS}
${PL_EDITOR_RESOURCES}
)
target_link_libraries( pl_editor
common
polygon
bitmaps
${OPENGL_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
install( TARGETS pl_editor
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()

34
pcb_calculator/CMakeLists.txt
View File

@ -53,10 +53,6 @@ if( APPLE )
set( MACOSX_BUNDLE_NAME pcb_calculator ) set( MACOSX_BUNDLE_NAME pcb_calculator )
endif() endif()
if( USE_KIWAY_DLLS )
#if( false )
add_executable( pcb_calculator WIN32 MACOSX_BUNDLE add_executable( pcb_calculator WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
../common/pgm_base.cpp ../common/pgm_base.cpp
@ -72,6 +68,7 @@ if( USE_KIWAY_DLLS )
bitmaps bitmaps
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pcb_calculator PROPERTIES set_target_properties( pcb_calculator PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcb_calculator.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcb_calculator.map" )
@ -97,6 +94,7 @@ if( USE_KIWAY_DLLS )
# The KIFACE is in pcb_calculator.cpp, export it: # The KIFACE is in pcb_calculator.cpp, export it:
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pcb_calculator_kiface PROPERTIES set_target_properties( pcb_calculator_kiface PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" )
@ -115,6 +113,7 @@ if( USE_KIWAY_DLLS )
set_target_properties( pcb_calculator_kiface PROPERTIES set_target_properties( pcb_calculator_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR} LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
) )
# put individual bundle outside of main bundle as a first step # put individual bundle outside of main bundle as a first step
# will be pulled into the main bundle when creating main bundle # will be pulled into the main bundle when creating main bundle
install( TARGETS pcb_calculator install( TARGETS pcb_calculator
@ -144,33 +143,6 @@ if( USE_KIWAY_DLLS )
) )
endif() endif()
else()
add_executable( pcb_calculator WIN32 MACOSX_BUNDLE
../common/single_top.cpp
pcb_calculator.cpp
${PCB_CALCULATOR_SRCS}
${PCB_CALCULATOR_RESOURCES}
)
set_source_files_properties( ../common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=0"
)
set_source_files_properties( pcb_calculator.cpp PROPERTIES
COMPILE_DEFINITIONS "COMPILING_DLL"
)
target_link_libraries( pcb_calculator
common
bitmaps
polygon
${wxWidgets_LIBRARIES}
)
install( TARGETS pcb_calculator
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()
# auto-generate pcb_calculator_datafile.h and pcb_calculator_datafile_keywords.cpp # auto-generate pcb_calculator_datafile.h and pcb_calculator_datafile_keywords.cpp
# for the storage data file format. # for the storage data file format.
make_lexer( make_lexer(

71
pcbnew/CMakeLists.txt
View File

@ -235,9 +235,6 @@ set( PCBNEW_CLASS_SRCS
printout_controler.cpp printout_controler.cpp
ratsnest.cpp ratsnest.cpp
ratsnest_viewitem.cpp ratsnest_viewitem.cpp
# specctra.cpp #moved in pcbcommon lib
# specctra_export.cpp
# specctra_keywords.cpp
specctra_import.cpp specctra_import.cpp
swap_layers.cpp swap_layers.cpp
target_edit.cpp target_edit.cpp
@ -513,9 +510,6 @@ if( BUILD_GITHUB_PLUGIN )
endif() endif()
if( USE_KIWAY_DLLS )
#if( false )
# a very small program launcher for pcbnew_kiface # a very small program launcher for pcbnew_kiface
add_executable( pcbnew WIN32 MACOSX_BUNDLE add_executable( pcbnew WIN32 MACOSX_BUNDLE
../common/single_top.cpp ../common/single_top.cpp
@ -531,6 +525,7 @@ if( USE_KIWAY_DLLS )
bitmaps bitmaps
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pcbnew PROPERTIES set_target_properties( pcbnew PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" ) LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" )
@ -550,6 +545,7 @@ if( USE_KIWAY_DLLS )
PREFIX ${KIFACE_PREFIX} PREFIX ${KIFACE_PREFIX}
SUFFIX ${KIFACE_SUFFIX} SUFFIX ${KIFACE_SUFFIX}
) )
if( ${OPENMP_FOUND} ) if( ${OPENMP_FOUND} )
set_target_properties( pcbnew_kiface PROPERTIES set_target_properties( pcbnew_kiface PROPERTIES
COMPILE_FLAGS ${OpenMP_CXX_FLAGS} COMPILE_FLAGS ${OpenMP_CXX_FLAGS}
@ -583,6 +579,7 @@ if( USE_KIWAY_DLLS )
# The KIFACE is in pcbnew.cpp, export it: # The KIFACE is in pcbnew.cpp, export it:
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( pcbnew_kiface PROPERTIES set_target_properties( pcbnew_kiface PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map" LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map"
@ -634,68 +631,6 @@ if( USE_KIWAY_DLLS )
) )
endif() endif()
else() # milestone A) kills this off:
add_executable( pcbnew WIN32 MACOSX_BUNDLE
../common/single_top.cpp
pcbnew.cpp
${PCBNEW_SRCS}
${PCBNEW_COMMON_SRCS}
${PCBNEW_SCRIPTING_SRCS}
${PCBNEW_RESOURCES}
)
set_source_files_properties( ../common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB;PGM_DATA_FILE_EXT=\"kicad_pcb\""
)
target_link_libraries( pcbnew
3d-viewer
pcbcommon
pnsrouter
common
pcad2kicadpcb
polygon
bitmaps
gal
lib_dxf
idf3
${GITHUB_PLUGIN_LIBRARIES}
${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES}
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
${PIXMAN_LIBRARY}
${Boost_LIBRARIES} # must follow GITHUB
${PCBNEW_EXTRA_LIBS}
)
# Only for win32 cross compilation using MXE
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
target_link_libraries( pcbnew
opengl32
glu32
pixman-1
fontconfig
freetype
bz2
)
endif()
if( MAKE_LINK_MAPS )
# generate a link map with cross reference
set_target_properties( pcbnew PROPERTIES
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map"
)
endif()
install( TARGETS pcbnew
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif()
add_dependencies( pcbnew lib-dependencies ) add_dependencies( pcbnew lib-dependencies )