kicad-developers team mailing list archive

[Simon Wells <swel024@xxxxxxxxx>]

does this still work if one has chosen a monolithic wxwidgets build?

On 21 March 2017 at 03:16, Jan Mrázek <email@xxxxxxxxxxxxxx> wrote:
> Both official one and KiCad one version of FindwxWidgets.cmake do not check if
> all the required components are part of the wxWidgets build. This couses trouble
> on Ubuntu when user misses libwxgtk3.0-dev package - CMake succeeds, build does
> not.
>
> Probably only posibility to get a list of components is to grep output of
> wx-config.
>
> Base component is removed from the dependencies as it is not present on GUI
> builds of wxWidgets.
>
> Fixes: lp:1630020
> * https://bugs.launchpad.net/kicad/+bug/1630020
> ---
>  CMakeLists.txt                   |  2 +-
>  CMakeModules/FindwxWidgets.cmake | 36 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 18f2052e1..63f5b17a5 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -511,7 +511,7 @@ add_definitions( -DWX_COMPATIBILITY )
>  # See line 41 of CMakeModules/FindwxWidgets.cmake
>  set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --static=no )
>
> -find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
> +find_package( wxWidgets 3.0.0 REQUIRED gl aui adv html core net xml stc )
>
>  # Include wxWidgets macros.
>  include( ${wxWidgets_USE_FILE} )
> diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake
> index 9a6e56f7b..cb13bf93a 100644
> --- a/CMakeModules/FindwxWidgets.cmake
> +++ b/CMakeModules/FindwxWidgets.cmake
> @@ -141,6 +141,7 @@
>  #
>  # Miguel A. Figueroa-Villanueva (miguelf at ieee dot org).
>  # Jan Woetzel (jw at mip.informatik.uni-kiel.de).
> +# Jan Mrázek (email at honzamrazek.cz)
>  #
>  # Based on previous works of:
>  # Jan Woetzel (FindwxWindows.cmake),
> @@ -728,6 +729,38 @@ else()
>        endforeach()
>      endmacro()
>
> +    #
> +    # Check if all the required libraries are present in the build. The only way
> +    # to find out the list of libraries is to run wx-config and grep its output
> +    # - libraries are hardcoded in the help text.
> +    #
> +    macro(WX_CONFIG_CHECK_LIBS)
> +      execute_process(
> +        COMMAND "${wxWidgets_CONFIG_EXECUTABLE}"
> +        OUTPUT_VARIABLE _wx_selected_config
> +        ERROR_VARIABLE _wx_selected_config
> +        RESULT_VARIABLE _wx_result
> +        ERROR_QUIET
> +        )
> +      string(REGEX MATCH "Available libraries in this build are:\n(.*)\n"
> +       _wx_available_libs ${_wx_selected_config})
> +      string(REGEX REPLACE "Available libraries in this build are:\n(.*)\n"
> +        "\\1" _wx_available_libs ${_wx_available_libs})
> +      string(STRIP _wx_available_libs ${_wx_available_libs})
> +      string(REPLACE " " ";" _wx_available_libs "${_wx_available_libs}")
> +      foreach(lib ${wxWidgets_FIND_COMPONENTS})
> +        list(FIND _wx_available_libs "${lib}" _index)
> +        if (${_index} LESS 0)
> +          list(APPEND _missing ${lib})
> +          DBG_MSG("Library ${lib} not found")
> +        endif()
> +      endforeach()
> +      if (_missing)
> +        string(REPLACE ";" " " _missing "${_missing}")
> +        message(FATAL_ERROR "Missing following wxWidgets libraris: ${_missing}")
> +      endif()
> +    endmacro()
> +
>      #-----------------------------------------------------------------
>      # UNIX: Start actual work.
>      #-----------------------------------------------------------------
> @@ -741,6 +774,9 @@ else()
>      if(wxWidgets_CONFIG_EXECUTABLE)
>        set(wxWidgets_FOUND TRUE)
>
> +      # check if current build supports all required libraries
> +      WX_CONFIG_CHECK_LIBS()
> +
>        # get defaults based on "wx-config --selected-config"
>        WX_CONFIG_SELECT_GET_DEFAULT()
>
> --
> 2.11.0
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp