Remove old build configuration since kiway is now the only way to build kicad.
This commit is contained in:
Wayne Stambaugh
parent
ad645abac4
commit
e273a48ddc
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -68,109 +68,109 @@ 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
|
${CVPCB_RESOURCES}
|
||||||
${CVPCB_RESOURCES}
|
)
|
||||||
)
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
||||||
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
|
)
|
||||||
)
|
target_link_libraries( cvpcb
|
||||||
target_link_libraries( cvpcb
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
# There's way too much crap coming in from common yet.
|
||||||
# There's way too much crap coming in from common yet.
|
common
|
||||||
common
|
bitmaps
|
||||||
bitmaps
|
${wxWidgets_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
)
|
||||||
)
|
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( cvpcb PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# the main cvpcb program, in DSO form.
|
if( MAKE_LINK_MAPS )
|
||||||
add_library( cvpcb_kiface MODULE
|
set_target_properties( cvpcb PROPERTIES
|
||||||
cvpcb.cpp
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
|
||||||
${CVPCB_SRCS}
|
endif()
|
||||||
${CVPCB_DIALOGS}
|
|
||||||
)
|
# the main cvpcb program, in DSO form.
|
||||||
set_target_properties( cvpcb_kiface PROPERTIES
|
add_library( cvpcb_kiface MODULE
|
||||||
OUTPUT_NAME cvpcb
|
cvpcb.cpp
|
||||||
PREFIX ${KIFACE_PREFIX}
|
${CVPCB_SRCS}
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
${CVPCB_DIALOGS}
|
||||||
)
|
)
|
||||||
|
set_target_properties( cvpcb_kiface PROPERTIES
|
||||||
|
OUTPUT_NAME cvpcb
|
||||||
|
PREFIX ${KIFACE_PREFIX}
|
||||||
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
|
)
|
||||||
|
target_link_libraries( cvpcb_kiface
|
||||||
|
3d-viewer
|
||||||
|
pcbcommon
|
||||||
|
pcad2kicadpcb
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
polygon
|
||||||
|
gal
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
${OPENGL_LIBRARIES}
|
||||||
|
${GDI_PLUS_LIBRARIES}
|
||||||
|
${GLEW_LIBRARIES}
|
||||||
|
${CAIRO_LIBRARIES}
|
||||||
|
${PIXMAN_LIBRARY}
|
||||||
|
${OPENMP_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Only for win32 cross compilation using MXE
|
||||||
|
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
|
||||||
target_link_libraries( cvpcb_kiface
|
target_link_libraries( cvpcb_kiface
|
||||||
3d-viewer
|
opengl32
|
||||||
pcbcommon
|
glu32
|
||||||
pcad2kicadpcb
|
pixman-1
|
||||||
common
|
fontconfig
|
||||||
bitmaps
|
freetype
|
||||||
polygon
|
bz2
|
||||||
gal
|
)
|
||||||
${wxWidgets_LIBRARIES}
|
endif()
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${GDI_PLUS_LIBRARIES}
|
if( BUILD_GITHUB_PLUGIN )
|
||||||
${GLEW_LIBRARIES}
|
target_link_libraries( cvpcb_kiface github_plugin )
|
||||||
${CAIRO_LIBRARIES}
|
endif()
|
||||||
${PIXMAN_LIBRARY}
|
|
||||||
${OPENMP_LIBRARIES}
|
# Must follow github_plugin
|
||||||
|
target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES} )
|
||||||
|
|
||||||
|
if( UNIX AND NOT APPLE )
|
||||||
|
# -lrt must follow Boost
|
||||||
|
target_link_libraries( cvpcb_kiface rt )
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set_source_files_properties( cvpcb.cpp PROPERTIES
|
||||||
|
# The KIFACE is in cvpcb.cpp, export it:
|
||||||
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
|
if( MAKE_LINK_MAPS )
|
||||||
|
set_target_properties( cvpcb_kiface PROPERTIES
|
||||||
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# if building cvpcb, then also build cvpcb_kiface if out of date.
|
||||||
|
add_dependencies( cvpcb cvpcb_kiface )
|
||||||
|
|
||||||
|
# these 2 binaries are a matched set, keep them together:
|
||||||
|
if( APPLE )
|
||||||
|
set_target_properties( cvpcb PROPERTIES
|
||||||
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
)
|
||||||
|
|
||||||
# Only for win32 cross compilation using MXE
|
# puts binaries into the *.app bundle while linking
|
||||||
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
|
set_target_properties( cvpcb_kiface PROPERTIES
|
||||||
target_link_libraries( cvpcb_kiface
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
||||||
opengl32
|
|
||||||
glu32
|
|
||||||
pixman-1
|
|
||||||
fontconfig
|
|
||||||
freetype
|
|
||||||
bz2
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if( BUILD_GITHUB_PLUGIN )
|
|
||||||
target_link_libraries( cvpcb_kiface github_plugin )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Must follow github_plugin
|
|
||||||
target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES} )
|
|
||||||
|
|
||||||
if( UNIX AND NOT APPLE )
|
|
||||||
# -lrt must follow Boost
|
|
||||||
target_link_libraries( cvpcb_kiface rt )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set_source_files_properties( cvpcb.cpp PROPERTIES
|
|
||||||
# The KIFACE is in cvpcb.cpp, export it:
|
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
|
||||||
)
|
)
|
||||||
|
# put individual bundle outside of main bundle as a first step
|
||||||
if( MAKE_LINK_MAPS )
|
# will be pulled into the main bundle when creating main bundle
|
||||||
set_target_properties( cvpcb_kiface PROPERTIES
|
install( TARGETS cvpcb
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )
|
DESTINATION ${KICAD_BIN}
|
||||||
endif()
|
COMPONENT binary
|
||||||
|
)
|
||||||
# if building cvpcb, then also build cvpcb_kiface if out of date.
|
install( CODE "
|
||||||
add_dependencies( cvpcb cvpcb_kiface )
|
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together:
|
|
||||||
if( APPLE )
|
|
||||||
set_target_properties( cvpcb PROPERTIES
|
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
|
||||||
)
|
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
|
||||||
set_target_properties( cvpcb_kiface PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
||||||
)
|
|
||||||
# put individual bundle outside of main bundle as a first step
|
|
||||||
# will be pulled into the main bundle when creating main bundle
|
|
||||||
install( TARGETS cvpcb
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( CODE "
|
|
||||||
# override default embedded path settings
|
# override default embedded path settings
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
|
@ -181,62 +181,14 @@ if( USE_KIWAY_DLLS )
|
||||||
\"\"
|
\"\"
|
||||||
)
|
)
|
||||||
" COMPONENT Runtime
|
" COMPONENT Runtime
|
||||||
)
|
)
|
||||||
else()
|
|
||||||
install( TARGETS cvpcb
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS cvpcb_kiface
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
else()
|
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
|
install( TARGETS cvpcb
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
|
install( TARGETS cvpcb_kiface
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -218,79 +218,77 @@ 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
|
${EESCHEMA_RESOURCES}
|
||||||
${EESCHEMA_RESOURCES}
|
)
|
||||||
)
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
||||||
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
|
)
|
||||||
)
|
target_link_libraries( eeschema
|
||||||
target_link_libraries( eeschema
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
# There's way too much crap coming in from common yet.
|
||||||
# There's way too much crap coming in from common yet.
|
common
|
||||||
common
|
bitmaps
|
||||||
bitmaps
|
${wxWidgets_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
)
|
||||||
)
|
|
||||||
|
|
||||||
# the DSO (KIFACE) housing the main eeschema code:
|
# the DSO (KIFACE) housing the main eeschema code:
|
||||||
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
|
bitmaps
|
||||||
bitmaps
|
polygon
|
||||||
polygon
|
${wxWidgets_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
)
|
||||||
)
|
set_target_properties( eeschema_kiface PROPERTIES
|
||||||
|
# Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
|
||||||
|
# _eeschema.so, _eeschema.dll, or _eeschema.kiface
|
||||||
|
OUTPUT_NAME eeschema
|
||||||
|
PREFIX ${KIFACE_PREFIX}
|
||||||
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
|
)
|
||||||
|
|
||||||
|
# The KIFACE is in eeschema.cpp, export it:
|
||||||
|
set_source_files_properties( eeschema.cpp PROPERTIES
|
||||||
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
|
# if building eeschema, then also build eeschema_kiface if out of date.
|
||||||
|
add_dependencies( eeschema eeschema_kiface )
|
||||||
|
|
||||||
|
if( MAKE_LINK_MAPS )
|
||||||
|
# generate link map with cross reference
|
||||||
set_target_properties( eeschema_kiface PROPERTIES
|
set_target_properties( eeschema_kiface PROPERTIES
|
||||||
# Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=${KIFACE_PREFIX}eeschema${KIFACE_SUFFIX}.map"
|
||||||
# _eeschema.so, _eeschema.dll, or _eeschema.kiface
|
)
|
||||||
OUTPUT_NAME eeschema
|
set_target_properties( eeschema PROPERTIES
|
||||||
PREFIX ${KIFACE_PREFIX}
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=eeschema.map"
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# these 2 binaries are a matched set, keep them together:
|
||||||
|
if( APPLE )
|
||||||
|
set_target_properties( eeschema PROPERTIES
|
||||||
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
)
|
||||||
|
|
||||||
# The KIFACE is in eeschema.cpp, export it:
|
# puts binaries into the *.app bundle while linking
|
||||||
set_source_files_properties( eeschema.cpp PROPERTIES
|
set_target_properties( eeschema_kiface PROPERTIES
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
||||||
)
|
)
|
||||||
|
# put individual bundle outside of main bundle as a first step
|
||||||
# if building eeschema, then also build eeschema_kiface if out of date.
|
# will be pulled into the main bundle when creating main bundle
|
||||||
add_dependencies( eeschema eeschema_kiface )
|
install( TARGETS eeschema
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
if( MAKE_LINK_MAPS )
|
COMPONENT binary
|
||||||
# generate link map with cross reference
|
)
|
||||||
set_target_properties( eeschema_kiface PROPERTIES
|
install( CODE "
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=${KIFACE_PREFIX}eeschema${KIFACE_SUFFIX}.map"
|
|
||||||
)
|
|
||||||
set_target_properties( eeschema PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=eeschema.map"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together:
|
|
||||||
if( APPLE )
|
|
||||||
set_target_properties( eeschema PROPERTIES
|
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
|
||||||
)
|
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
|
||||||
set_target_properties( eeschema_kiface PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
||||||
)
|
|
||||||
# put individual bundle outside of main bundle as a first step
|
|
||||||
# will be pulled into the main bundle when creating main bundle
|
|
||||||
install( TARGETS eeschema
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( CODE "
|
|
||||||
# override default embedded path settings
|
# override default embedded path settings
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
|
@ -301,46 +299,18 @@ if( USE_KIWAY_DLLS )
|
||||||
\"\"
|
\"\"
|
||||||
)
|
)
|
||||||
" COMPONENT Runtime
|
" COMPONENT Runtime
|
||||||
)
|
)
|
||||||
else()
|
|
||||||
install( TARGETS eeschema
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS eeschema_kiface
|
|
||||||
# actual filename subject to change at milestone C)
|
|
||||||
# modular-kicad blueprint.
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
else()
|
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
|
install( TARGETS eeschema
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
|
install( TARGETS eeschema_kiface
|
||||||
|
# actual filename subject to change at milestone C)
|
||||||
|
# modular-kicad blueprint.
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
endif()
|
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
|
||||||
|
|
|
||||||
|
|
@ -93,77 +93,77 @@ if( APPLE )
|
||||||
set( MACOSX_BUNDLE_NAME gerbview )
|
set( MACOSX_BUNDLE_NAME gerbview )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( USE_KIWAY_DLLS )
|
add_executable( gerbview WIN32 MACOSX_BUNDLE
|
||||||
|
../common/single_top.cpp
|
||||||
|
../common/pgm_base.cpp
|
||||||
|
${GERBVIEW_RESOURCES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
||||||
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_GERBER;BUILD_KIWAY_DLL"
|
||||||
|
)
|
||||||
|
target_link_libraries( gerbview
|
||||||
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
|
# There's way too much crap coming in from common yet.
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
add_executable( gerbview WIN32 MACOSX_BUNDLE
|
if( MAKE_LINK_MAPS )
|
||||||
../common/single_top.cpp
|
set_target_properties( gerbview PROPERTIES
|
||||||
../common/pgm_base.cpp
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=gerbview.map" )
|
||||||
${GERBVIEW_RESOURCES}
|
endif()
|
||||||
)
|
|
||||||
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_GERBER;BUILD_KIWAY_DLL"
|
|
||||||
)
|
|
||||||
target_link_libraries( gerbview
|
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
|
||||||
# There's way too much crap coming in from common yet.
|
|
||||||
common
|
|
||||||
bitmaps
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
)
|
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( gerbview PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=gerbview.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# the main gerbview program, in DSO form.
|
# the main gerbview program, in DSO form.
|
||||||
add_library( gerbview_kiface MODULE
|
add_library( gerbview_kiface MODULE
|
||||||
gerbview.cpp
|
gerbview.cpp
|
||||||
${GERBVIEW_SRCS}
|
${GERBVIEW_SRCS}
|
||||||
${DIALOGS_SRCS}
|
${DIALOGS_SRCS}
|
||||||
${GERBVIEW_EXTRA_SRCS}
|
${GERBVIEW_EXTRA_SRCS}
|
||||||
)
|
)
|
||||||
|
set_target_properties( gerbview_kiface PROPERTIES
|
||||||
|
OUTPUT_NAME gerbview
|
||||||
|
PREFIX ${KIFACE_PREFIX}
|
||||||
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
|
)
|
||||||
|
target_link_libraries( gerbview_kiface
|
||||||
|
common
|
||||||
|
polygon
|
||||||
|
bitmaps
|
||||||
|
${OPENGL_LIBRARIES}
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
${GDI_PLUS_LIBRARIES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( gerbview.cpp PROPERTIES
|
||||||
|
# The KIFACE is in gerbview.cpp, export it:
|
||||||
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
|
if( MAKE_LINK_MAPS )
|
||||||
set_target_properties( gerbview_kiface PROPERTIES
|
set_target_properties( gerbview_kiface PROPERTIES
|
||||||
OUTPUT_NAME gerbview
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )
|
||||||
PREFIX ${KIFACE_PREFIX}
|
endif()
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
|
||||||
)
|
|
||||||
target_link_libraries( gerbview_kiface
|
|
||||||
common
|
|
||||||
polygon
|
|
||||||
bitmaps
|
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
${GDI_PLUS_LIBRARIES}
|
|
||||||
)
|
|
||||||
set_source_files_properties( gerbview.cpp PROPERTIES
|
|
||||||
# The KIFACE is in gerbview.cpp, export it:
|
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
|
||||||
)
|
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( gerbview_kiface PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# if building gerbview, then also build gerbview_kiface if out of date.
|
# if building gerbview, then also build gerbview_kiface if out of date.
|
||||||
add_dependencies( gerbview gerbview_kiface )
|
add_dependencies( gerbview gerbview_kiface )
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together
|
# these 2 binaries are a matched set, keep them together
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
set_target_properties( gerbview PROPERTIES
|
set_target_properties( gerbview PROPERTIES
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
)
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
# puts binaries into the *.app bundle while linking
|
||||||
set_target_properties( gerbview_kiface PROPERTIES
|
set_target_properties( gerbview_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 gerbview
|
install( TARGETS gerbview
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
install( CODE "
|
install( CODE "
|
||||||
# override default embedded path settings
|
# override default embedded path settings
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
|
@ -174,38 +174,14 @@ if( USE_KIWAY_DLLS )
|
||||||
\"\"
|
\"\"
|
||||||
)
|
)
|
||||||
" COMPONENT Runtime
|
" COMPONENT Runtime
|
||||||
)
|
)
|
||||||
else()
|
|
||||||
install( TARGETS gerbview
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS gerbview_kiface
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
else()
|
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
|
install( TARGETS gerbview
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
|
install( TARGETS gerbview_kiface
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -67,121 +67,97 @@ if( APPLE )
|
||||||
set( MACOSX_BUNDLE_NAME pl_editor )
|
set( MACOSX_BUNDLE_NAME pl_editor )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# a very small program launcher for pl_editor_kiface
|
||||||
|
add_executable( pl_editor WIN32 MACOSX_BUNDLE
|
||||||
|
../common/single_top.cpp
|
||||||
|
../common/pgm_base.cpp
|
||||||
|
${PL_EDITOR_RESOURCES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
||||||
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PL_EDITOR;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL"
|
||||||
|
)
|
||||||
|
target_link_libraries( pl_editor
|
||||||
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
|
# There's way too much crap coming in from common yet.
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
if( USE_KIWAY_DLLS )
|
if( MAKE_LINK_MAPS )
|
||||||
|
set_target_properties( pl_editor PROPERTIES
|
||||||
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" )
|
||||||
|
endif()
|
||||||
|
|
||||||
# a very small program launcher for pl_editor_kiface
|
# the main pl_editor program, in DSO form.
|
||||||
add_executable( pl_editor WIN32 MACOSX_BUNDLE
|
add_library( pl_editor_kiface MODULE
|
||||||
../common/single_top.cpp
|
pl_editor.cpp
|
||||||
../common/pgm_base.cpp
|
${PL_EDITOR_SRCS}
|
||||||
${PL_EDITOR_RESOURCES}
|
${DIALOGS_SRCS}
|
||||||
)
|
${PL_EDITOR_EXTRA_SRCS}
|
||||||
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
)
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PL_EDITOR;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL"
|
target_link_libraries( pl_editor_kiface
|
||||||
)
|
common
|
||||||
target_link_libraries( pl_editor
|
polygon
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
bitmaps
|
||||||
# There's way too much crap coming in from common yet.
|
${OPENGL_LIBRARIES}
|
||||||
common
|
${wxWidgets_LIBRARIES}
|
||||||
bitmaps
|
${GDI_PLUS_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
)
|
||||||
)
|
set_target_properties( pl_editor_kiface PROPERTIES
|
||||||
if( MAKE_LINK_MAPS )
|
OUTPUT_NAME pl_editor
|
||||||
set_target_properties( pl_editor PROPERTIES
|
PREFIX ${KIFACE_PREFIX}
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" )
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
endif()
|
)
|
||||||
|
set_source_files_properties( pl_editor.cpp PROPERTIES
|
||||||
|
# The KIFACE is in pcbnew.cpp, export it:
|
||||||
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
# the main pl_editor program, in DSO form.
|
if( MAKE_LINK_MAPS )
|
||||||
add_library( pl_editor_kiface MODULE
|
|
||||||
pl_editor.cpp
|
|
||||||
${PL_EDITOR_SRCS}
|
|
||||||
${DIALOGS_SRCS}
|
|
||||||
${PL_EDITOR_EXTRA_SRCS}
|
|
||||||
)
|
|
||||||
target_link_libraries( pl_editor_kiface
|
|
||||||
common
|
|
||||||
polygon
|
|
||||||
bitmaps
|
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
${GDI_PLUS_LIBRARIES}
|
|
||||||
)
|
|
||||||
set_target_properties( pl_editor_kiface PROPERTIES
|
set_target_properties( pl_editor_kiface PROPERTIES
|
||||||
OUTPUT_NAME pl_editor
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )
|
||||||
PREFIX ${KIFACE_PREFIX}
|
endif()
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
|
||||||
|
# if building pl_editor, then also build pl_editor_kiface if out of date.
|
||||||
|
add_dependencies( pl_editor pl_editor_kiface )
|
||||||
|
|
||||||
|
# these 2 binaries are a matched set, keep them together:
|
||||||
|
if( APPLE )
|
||||||
|
set_target_properties( pl_editor PROPERTIES
|
||||||
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
)
|
||||||
set_source_files_properties( pl_editor.cpp PROPERTIES
|
|
||||||
# The KIFACE is in pcbnew.cpp, export it:
|
# puts binaries into the *.app bundle while linking
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
set_target_properties( pl_editor_kiface PROPERTIES
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
||||||
)
|
)
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( pl_editor_kiface PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# if building pl_editor, then also build pl_editor_kiface if out of date.
|
# put individual bundle outside of main bundle as a first step
|
||||||
add_dependencies( pl_editor pl_editor_kiface )
|
# will be pulled into the main bundle when creating main bundle
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together:
|
|
||||||
if( APPLE )
|
|
||||||
set_target_properties( pl_editor PROPERTIES
|
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
|
||||||
)
|
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
|
||||||
set_target_properties( pl_editor_kiface PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
||||||
)
|
|
||||||
# put individual bundle outside of main bundle as a first step
|
|
||||||
# will be pulled into the main bundle when creating main bundle
|
|
||||||
install( TARGETS pl_editor
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( CODE "
|
|
||||||
# override default embedded path settings
|
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
|
||||||
|
|
||||||
# do all the work
|
|
||||||
include( BundleUtilities )
|
|
||||||
fixup_bundle( ${KICAD_BIN}/pl_editor.app/Contents/MacOS/pl_editor
|
|
||||||
\"\"
|
|
||||||
\"\"
|
|
||||||
)
|
|
||||||
" COMPONENT Runtime
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
install( TARGETS pl_editor
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS pl_editor_kiface
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
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
|
install( TARGETS pl_editor
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
|
install( CODE "
|
||||||
|
# override default embedded path settings
|
||||||
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
# do all the work
|
||||||
|
include( BundleUtilities )
|
||||||
|
fixup_bundle( ${KICAD_BIN}/pl_editor.app/Contents/MacOS/pl_editor
|
||||||
|
\"\"
|
||||||
|
\"\"
|
||||||
|
)
|
||||||
|
" COMPONENT Runtime
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
install( TARGETS pl_editor
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
|
install( TARGETS pl_editor_kiface
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -53,122 +53,94 @@ if( APPLE )
|
||||||
set( MACOSX_BUNDLE_NAME pcb_calculator )
|
set( MACOSX_BUNDLE_NAME pcb_calculator )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_executable( pcb_calculator WIN32 MACOSX_BUNDLE
|
||||||
|
../common/single_top.cpp
|
||||||
|
../common/pgm_base.cpp
|
||||||
|
${PCB_CALCULATOR_RESOURCES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
||||||
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL"
|
||||||
|
)
|
||||||
|
target_link_libraries( pcb_calculator
|
||||||
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
|
# There's way too much crap coming in from common yet.
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
if( USE_KIWAY_DLLS )
|
if( MAKE_LINK_MAPS )
|
||||||
#if( false )
|
set_target_properties( pcb_calculator PROPERTIES
|
||||||
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcb_calculator.map" )
|
||||||
|
endif()
|
||||||
|
|
||||||
add_executable( pcb_calculator WIN32 MACOSX_BUNDLE
|
# the main pcb_calculator program, in DSO form.
|
||||||
../common/single_top.cpp
|
add_library( pcb_calculator_kiface MODULE
|
||||||
../common/pgm_base.cpp
|
pcb_calculator.cpp
|
||||||
${PCB_CALCULATOR_RESOURCES}
|
${PCB_CALCULATOR_SRCS}
|
||||||
)
|
)
|
||||||
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
set_target_properties( pcb_calculator_kiface PROPERTIES
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL"
|
OUTPUT_NAME pcb_calculator
|
||||||
)
|
PREFIX ${KIFACE_PREFIX}
|
||||||
target_link_libraries( pcb_calculator
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
)
|
||||||
# There's way too much crap coming in from common yet.
|
target_link_libraries( pcb_calculator_kiface
|
||||||
common
|
common
|
||||||
bitmaps
|
bitmaps
|
||||||
${wxWidgets_LIBRARIES}
|
polygon
|
||||||
)
|
${wxWidgets_LIBRARIES}
|
||||||
if( MAKE_LINK_MAPS )
|
)
|
||||||
set_target_properties( pcb_calculator PROPERTIES
|
set_source_files_properties( pcb_calculator.cpp PROPERTIES
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcb_calculator.map" )
|
# The KIFACE is in pcb_calculator.cpp, export it:
|
||||||
endif()
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
# the main pcb_calculator program, in DSO form.
|
if( MAKE_LINK_MAPS )
|
||||||
add_library( pcb_calculator_kiface MODULE
|
|
||||||
pcb_calculator.cpp
|
|
||||||
${PCB_CALCULATOR_SRCS}
|
|
||||||
)
|
|
||||||
set_target_properties( pcb_calculator_kiface PROPERTIES
|
set_target_properties( pcb_calculator_kiface PROPERTIES
|
||||||
OUTPUT_NAME pcb_calculator
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" )
|
||||||
PREFIX ${KIFACE_PREFIX}
|
endif()
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
|
||||||
)
|
|
||||||
target_link_libraries( pcb_calculator_kiface
|
|
||||||
common
|
|
||||||
bitmaps
|
|
||||||
polygon
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
)
|
|
||||||
set_source_files_properties( pcb_calculator.cpp PROPERTIES
|
|
||||||
# The KIFACE is in pcb_calculator.cpp, export it:
|
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
|
||||||
)
|
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( pcb_calculator_kiface PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# if building pcb_calculator, then also build pcb_calculator_kiface if out of date.
|
# if building pcb_calculator, then also build pcb_calculator_kiface if out of date.
|
||||||
add_dependencies( pcb_calculator pcb_calculator_kiface )
|
add_dependencies( pcb_calculator pcb_calculator_kiface )
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together
|
# these 2 binaries are a matched set, keep them together
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
set_target_properties( pcb_calculator PROPERTIES
|
set_target_properties( pcb_calculator PROPERTIES
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
|
||||||
set_target_properties( pcb_calculator_kiface PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
||||||
)
|
|
||||||
# put individual bundle outside of main bundle as a first step
|
|
||||||
# will be pulled into the main bundle when creating main bundle
|
|
||||||
install( TARGETS pcb_calculator
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( CODE "
|
|
||||||
# override default embedded path settings
|
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
|
||||||
|
|
||||||
# do all the work
|
|
||||||
include( BundleUtilities )
|
|
||||||
fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator
|
|
||||||
\"\"
|
|
||||||
\"\"
|
|
||||||
)
|
|
||||||
" COMPONENT Runtime
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
install( TARGETS pcb_calculator
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS pcb_calculator_kiface
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
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"
|
# puts binaries into the *.app bundle while linking
|
||||||
)
|
set_target_properties( pcb_calculator_kiface PROPERTIES
|
||||||
set_source_files_properties( pcb_calculator.cpp PROPERTIES
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
||||||
COMPILE_DEFINITIONS "COMPILING_DLL"
|
|
||||||
)
|
|
||||||
target_link_libraries( pcb_calculator
|
|
||||||
common
|
|
||||||
bitmaps
|
|
||||||
polygon
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# put individual bundle outside of main bundle as a first step
|
||||||
|
# will be pulled into the main bundle when creating main bundle
|
||||||
install( TARGETS pcb_calculator
|
install( TARGETS pcb_calculator
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
|
install( CODE "
|
||||||
|
# override default embedded path settings
|
||||||
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
# do all the work
|
||||||
|
include( BundleUtilities )
|
||||||
|
fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator
|
||||||
|
\"\"
|
||||||
|
\"\"
|
||||||
|
)
|
||||||
|
" COMPONENT Runtime
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
install( TARGETS pcb_calculator
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
|
install( TARGETS pcb_calculator_kiface
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
endif()
|
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
|
||||||
|
|
|
||||||
|
|
@ -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,188 +510,126 @@ if( BUILD_GITHUB_PLUGIN )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if( USE_KIWAY_DLLS )
|
# a very small program launcher for pcbnew_kiface
|
||||||
#if( false )
|
add_executable( pcbnew WIN32 MACOSX_BUNDLE
|
||||||
|
../common/single_top.cpp
|
||||||
|
${PCBNEW_RESOURCES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( ../common/single_top.cpp pcbnew.cpp PROPERTIES
|
||||||
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL"
|
||||||
|
)
|
||||||
|
target_link_libraries( pcbnew
|
||||||
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
|
# There's way too much crap coming in from common yet.
|
||||||
|
common
|
||||||
|
bitmaps
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
# a very small program launcher for pcbnew_kiface
|
if( MAKE_LINK_MAPS )
|
||||||
add_executable( pcbnew WIN32 MACOSX_BUNDLE
|
set_target_properties( pcbnew PROPERTIES
|
||||||
../common/single_top.cpp
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" )
|
||||||
${PCBNEW_RESOURCES}
|
endif()
|
||||||
)
|
|
||||||
set_source_files_properties( ../common/single_top.cpp pcbnew.cpp PROPERTIES
|
|
||||||
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL"
|
|
||||||
)
|
|
||||||
target_link_libraries( pcbnew
|
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
|
||||||
# There's way too much crap coming in from common yet.
|
|
||||||
common
|
|
||||||
bitmaps
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
)
|
|
||||||
if( MAKE_LINK_MAPS )
|
|
||||||
set_target_properties( pcbnew PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# the main pcbnew program, in DSO form.
|
# the main pcbnew program, in DSO form.
|
||||||
add_library( pcbnew_kiface MODULE
|
add_library( pcbnew_kiface MODULE
|
||||||
pcbnew.cpp
|
pcbnew.cpp
|
||||||
${PCBNEW_SRCS}
|
${PCBNEW_SRCS}
|
||||||
${PCBNEW_COMMON_SRCS}
|
${PCBNEW_COMMON_SRCS}
|
||||||
${PCBNEW_SCRIPTING_SRCS}
|
${PCBNEW_SCRIPTING_SRCS}
|
||||||
)
|
)
|
||||||
|
set_target_properties( pcbnew_kiface PROPERTIES
|
||||||
|
# Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
|
||||||
|
# _pcbnew.so, _pcbnew.dll, or _pcbnew.kiface
|
||||||
|
OUTPUT_NAME pcbnew
|
||||||
|
PREFIX ${KIFACE_PREFIX}
|
||||||
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
|
)
|
||||||
|
|
||||||
|
if( ${OPENMP_FOUND} )
|
||||||
set_target_properties( pcbnew_kiface PROPERTIES
|
set_target_properties( pcbnew_kiface PROPERTIES
|
||||||
# Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
|
COMPILE_FLAGS ${OpenMP_CXX_FLAGS}
|
||||||
# _pcbnew.so, _pcbnew.dll, or _pcbnew.kiface
|
|
||||||
OUTPUT_NAME pcbnew
|
|
||||||
PREFIX ${KIFACE_PREFIX}
|
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
|
||||||
)
|
)
|
||||||
if( ${OPENMP_FOUND} )
|
endif()
|
||||||
set_target_properties( pcbnew_kiface PROPERTIES
|
|
||||||
COMPILE_FLAGS ${OpenMP_CXX_FLAGS}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
target_link_libraries( pcbnew_kiface
|
target_link_libraries( pcbnew_kiface
|
||||||
3d-viewer
|
3d-viewer
|
||||||
pcbcommon
|
pcbcommon
|
||||||
pnsrouter
|
pnsrouter
|
||||||
common
|
common
|
||||||
pcad2kicadpcb
|
pcad2kicadpcb
|
||||||
polygon
|
polygon
|
||||||
bitmaps
|
bitmaps
|
||||||
gal
|
gal
|
||||||
lib_dxf
|
lib_dxf
|
||||||
idf3
|
idf3
|
||||||
${GITHUB_PLUGIN_LIBRARIES}
|
${GITHUB_PLUGIN_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
${GDI_PLUS_LIBRARIES}
|
${GDI_PLUS_LIBRARIES}
|
||||||
${PYTHON_LIBRARIES}
|
${PYTHON_LIBRARIES}
|
||||||
${GLEW_LIBRARIES}
|
${GLEW_LIBRARIES}
|
||||||
${CAIRO_LIBRARIES}
|
${CAIRO_LIBRARIES}
|
||||||
${PIXMAN_LIBRARY}
|
${PIXMAN_LIBRARY}
|
||||||
${Boost_LIBRARIES} # must follow GITHUB
|
${Boost_LIBRARIES} # must follow GITHUB
|
||||||
${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost
|
${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost
|
||||||
${OPENMP_LIBRARIES}
|
${OPENMP_LIBRARIES}
|
||||||
|
)
|
||||||
|
set_source_files_properties( pcbnew.cpp PROPERTIES
|
||||||
|
# The KIFACE is in pcbnew.cpp, export it:
|
||||||
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
)
|
||||||
|
|
||||||
|
if( MAKE_LINK_MAPS )
|
||||||
|
set_target_properties( pcbnew_kiface PROPERTIES
|
||||||
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map"
|
||||||
)
|
)
|
||||||
set_source_files_properties( pcbnew.cpp PROPERTIES
|
set_target_properties( pcbnew PROPERTIES
|
||||||
# The KIFACE is in pcbnew.cpp, export it:
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map"
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
|
||||||
)
|
)
|
||||||
if( MAKE_LINK_MAPS )
|
endif()
|
||||||
set_target_properties( pcbnew_kiface PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map"
|
|
||||||
)
|
|
||||||
set_target_properties( pcbnew PROPERTIES
|
|
||||||
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# if building pcbnew, then also build pcbnew_kiface if out of date.
|
# if building pcbnew, then also build pcbnew_kiface if out of date.
|
||||||
add_dependencies( pcbnew pcbnew_kiface )
|
add_dependencies( pcbnew pcbnew_kiface )
|
||||||
|
|
||||||
# these 2 binaries are a matched set, keep them together:
|
# these 2 binaries are a matched set, keep them together:
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
set_target_properties( pcbnew PROPERTIES
|
set_target_properties( pcbnew PROPERTIES
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||||
)
|
|
||||||
|
|
||||||
# puts binaries into the *.app bundle while linking
|
|
||||||
set_target_properties( pcbnew_kiface PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
||||||
)
|
|
||||||
# put individual bundle outside of main bundle as a first step
|
|
||||||
# will be pulled into the main bundle when creating main bundle
|
|
||||||
install( TARGETS pcbnew
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( CODE "
|
|
||||||
# override default embedded path settings
|
|
||||||
${OSX_BUNDLE_OVERRIDE_PATHS}
|
|
||||||
|
|
||||||
# do all the work
|
|
||||||
include( BundleUtilities )
|
|
||||||
fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew
|
|
||||||
\"\"
|
|
||||||
\"\"
|
|
||||||
)
|
|
||||||
" COMPONENT Runtime
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
install( TARGETS pcbnew
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
install( TARGETS pcbnew_kiface
|
|
||||||
DESTINATION ${KICAD_BIN}
|
|
||||||
COMPONENT binary
|
|
||||||
)
|
|
||||||
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
|
# puts binaries into the *.app bundle while linking
|
||||||
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
|
set_target_properties( pcbnew_kiface PROPERTIES
|
||||||
target_link_libraries( pcbnew
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
||||||
opengl32
|
)
|
||||||
glu32
|
# put individual bundle outside of main bundle as a first step
|
||||||
pixman-1
|
# will be pulled into the main bundle when creating main bundle
|
||||||
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
|
install( TARGETS pcbnew
|
||||||
DESTINATION ${KICAD_BIN}
|
DESTINATION ${KICAD_BIN}
|
||||||
COMPONENT binary
|
COMPONENT binary
|
||||||
)
|
)
|
||||||
endif()
|
install( CODE "
|
||||||
|
# override default embedded path settings
|
||||||
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
||||||
|
|
||||||
|
# do all the work
|
||||||
|
include( BundleUtilities )
|
||||||
|
fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew
|
||||||
|
\"\"
|
||||||
|
\"\"
|
||||||
|
)
|
||||||
|
" COMPONENT Runtime
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
install( TARGETS pcbnew
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
|
install( TARGETS pcbnew_kiface
|
||||||
|
DESTINATION ${KICAD_BIN}
|
||||||
|
COMPONENT binary
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_dependencies( pcbnew lib-dependencies )
|
add_dependencies( pcbnew lib-dependencies )
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue