diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-01-10 23:20:38 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-01-10 23:20:38 +0000 |
| commit | 0c2a4e2f17d5a2d3955c5a7d69f04fc8541d43ad (patch) | |
| tree | fd5324253fa5daf86e4c075e3e64e6a5584ce877 | |
| parent | Merge branch 'clonetiler-negative-shift' of gitlab.com:thestr4ng3r/inkscape (diff) | |
| parent | Explicitly link against libX11 for ld.gold (diff) | |
| download | inkscape-0c2a4e2f17d5a2d3955c5a7d69f04fc8541d43ad.tar.gz inkscape-0c2a4e2f17d5a2d3955c5a7d69f04fc8541d43ad.zip | |
Merge branch 'compile-with-gold' of gitlab.com:houz/inkscape
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ca0afe004..ffaf833f0 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -39,7 +39,7 @@ if(WIN32) list(APPEND INKSCAPE_LIBS "-lgomp") list(APPEND INKSCAPE_LIBS "-lwinpthread") - + if(HAVE_MINGW64) list(APPEND INKSCAPE_CXX_FLAGS "-m64") else() @@ -116,7 +116,7 @@ if(ENABLE_POPPLER) set(HAVE_POPPLER ON) if(ENABLE_POPPLER_CAIRO) if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) - set(HAVE_POPPLER_CAIRO ON) + set(HAVE_POPPLER_CAIRO ON) endif() if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) set(HAVE_POPPLER_GLIB ON) @@ -220,7 +220,7 @@ if(WITH_DBUS) list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/) list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) add_definitions(${DBUS_CFLAGS_OTHER}) - + else() set(WITH_DBUS OFF) endif() @@ -379,6 +379,14 @@ list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS) foreach(flag ${INKSCAPE_CXX_FLAGS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE) endforeach() + +# Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly +find_package(X11) +if(X11_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${X11_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${X11_LIBRARIES}) +endif(X11_FOUND) + # end Dependencies list(REMOVE_DUPLICATES INKSCAPE_LIBS) |