diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-03 14:52:32 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-03 14:52:32 +0000 |
| commit | abfd64975f01d7093c3f795d8b49d4f6063cd2d4 (patch) | |
| tree | c09dcde6b575548bddaa7d047db2d42566b5c741 | |
| parent | Fix for 687655 : New color wheel should not increase the width of docked Fill... (diff) | |
| download | inkscape-abfd64975f01d7093c3f795d8b49d4f6063cd2d4.tar.gz inkscape-abfd64975f01d7093c3f795d8b49d4f6063cd2d4.zip | |
fix for cmake linking, currently include some hard coded paths since their are no find modules for these libs at the moment.
inkscape now builds with cmake (on my system at least)
(bzr r11730)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e24cba38c..3a6b6c44f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -19,14 +19,20 @@ find_package(GSL REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) if (WIN32) - list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME - list(APPEND INKSCAPE_LIBS "-lgobject-2.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME + list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME +else() + list(APPEND INKSCAPE_LIBS "-ldl") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() + list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME if(WITH_GNOME_VFS) @@ -177,7 +183,7 @@ list(APPEND INKSCAPE_LIBS ${GTK2_CAIROMM_LIBRARY} ${GTK2_GIOMM_LIBRARY} ${GTK2_SIGC++_LIBRARY} - + ${GTK2_GOBJECT_LIBRARY} ) |