Commit 786bb81c authored by Marco Serantoni's avatar Marco Serantoni
Browse files

[MacOSX] KICAD_BUILD_DYNAMIC stabilized and almost working

parent 6181e9e4

CMakeLists.txt

+13 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) 
        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )

        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )



        # Allows .dylib relocation in the future

        set( CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -headerpad_max_install_names")



        if( NOT CMAKE_CXX_COMPILER )

            EXEC_PROGRAM( wx-config ARGS --cc  OUTPUT_VARIABLE CMAKE_C_COMPILER )

        endif( NOT CMAKE_CXX_COMPILER )
@@ -332,6 +335,11 @@ if ( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC ) 
        set( CAIRO_INCLUDE_DIR  "${CAIRO_ROOT}/include/cairo")

        set( CAIRO_LIBRARY      "${CAIRO_ROOT}/lib/libcairo.a")



    if( KICAD_BUILD_DYNAMIC AND APPLE ) 

        add_custom_target( osx_fix_bundles ALL DEPENDS cvpcb eeschema gerbview kicad pcbnew bitmap2component pcb_calculator pl_editor)

        add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND scripts/osx_fixbundle.sh COMMENT "Migrating dylibs to bundles")

    endif()





endif( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC)
@@ -525,8 +533,13 @@ add_dependencies( pcad2kicadpcb lib-dependencies ) 
add_dependencies( polygon lib-dependencies )

add_dependencies( pl_editor lib-dependencies )

add_dependencies( pnsrouter lib-dependencies )

    if ( BUILD_GITHUB_PLUGIN ) 

    add_dependencies( github_plugin lib-dependencies )

    endif()

endif()



if ( KICAD_BUILD_DYNAMIC )

endif()



#############

# Resources #

CMakeModules/download_cairo.cmake

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ ExternalProject_Add( cairo 
    BUILD_IN_SOURCE   1

    #SOURCE_DIR       "${PREFIX}"

    #PATCH_COMMAND    ""

    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${CAIRO_ROOT}"



    CONFIGURE_COMMAND ./configure --prefix=${CAIRO_ROOT} --enable-static ${CAIRO_BUILDTYPE}

                      PKG_CONFIG=${PROJECT_SOURCE_DIR}/pkgconfig_root/bin/pkg-config

CMakeModules/download_glew.cmake

+16 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ ExternalProject_Add( glew 
    #SOURCE_DIR      "${PREFIX}"

    BUILD_IN_SOURCE 1



    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${GLEW_ROOT}"



    #PATCH_COMMAND     "true"

    CONFIGURE_COMMAND ""
@@ -68,5 +70,18 @@ ExternalProject_Add( glew 
    BUILD_COMMAND   $(MAKE) ${GLEW_CFLAGS} ${GLEW_LDFLAGS} ${GLEW_STRIP}



    INSTALL_DIR      "${GLEW_ROOT}"

    INSTALL_COMMAND  $(MAKE) GLEW_DEST="${GLEW_ROOT}" install && ranlib "${GLEW_ROOT}/lib/libGLEW.a"

    INSTALL_COMMAND  $(MAKE) GLEW_DEST="${GLEW_ROOT}" install

    )



#

# Optional Steps

#



if( APPLE )

# On OSX is needed to run ranlib to make .a indexes for all platforms

ExternalProject_Add_Step( glew glew_osx_ranlib

    COMMAND ranlib "${GLEW_ROOT}/lib/libGLEW.a"

    COMMENT "ranlib ${GLEW_ROOT}/lib/libGLEW.a - Needed on OSX only"

    DEPENDEES install

    )

endif()

CMakeModules/download_libpng.cmake

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ ExternalProject_Add( libpng 
    #PATCH_COMMAND     "true"

    CONFIGURE_COMMAND  ./configure --prefix=${LIBPNG_ROOT} ${LIBPNG_OPTS} ${LIBPNG_CFLAGS} --disable-dependency-tracking

    #BINARY_DIR      "${PREFIX}"

    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${LIBPNG_ROOT}"



    BUILD_COMMAND   $(MAKE)

CMakeModules/download_pixman.cmake

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ ExternalProject_Add( pixman 
    #SOURCE_DIR      "${PREFIX}"

    BUILD_IN_SOURCE 1



    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PIXMAN_ROOT}"



    #PATCH_COMMAND     "true"

    CONFIGURE_COMMAND ./configure --prefix=${PIXMAN_ROOT} ${PIXMAN_OPTS} ${PIXMAN_CPPFLAGS}  --disable-dependency-tracking

    #BINARY_DIR      "${PREFIX}"