Commit e273a48d authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

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

parent ad645aba

CMakeLists.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -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

cvpcb/CMakeLists.txt

+103 −151
Original line number Original line Diff line number Diff line
@@ -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()

eeschema/CMakeLists.txt

+71 −101
Original line number Original line Diff line number Diff line
@@ -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(

gerbview/CMakeLists.txt

+71 −95
Original line number Original line Diff line number Diff line
@@ -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()

pagelayout_editor/CMakeLists.txt

+81 −105
Original line number Original line Diff line number Diff line
@@ -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()