Advertisement
Guest User

Untitled

a guest
Apr 20th, 2012
77
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.04 KB | None | 0 0
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index ba148a6..859061a 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -530,8 +530,8 @@ if(NOT DISABLE_WX)
  6.             add_definitions(-D__WXGTK__)
  7.  
  8.             # Check for required libs
  9. -           check_lib(GTHREAD2 gthread-2.0 glib/gthread.h REQUIRED)
  10. -           check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED)
  11. +           check_lib(GTHREAD2 gthread-2.0 glib-2.0/glib/gthread.h REQUIRED)
  12. +           check_lib(PANGOCAIRO pangocairo-1.0 pango-1.0/pango/pangocairo.h REQUIRED)
  13.         elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
  14.             add_definitions(-D__WXMSW__)
  15.         else()
  16. diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt
  17. index 5b9891b..3b047f4 100644
  18. --- a/Externals/wxWidgets3/CMakeLists.txt
  19. +++ b/Externals/wxWidgets3/CMakeLists.txt
  20. @@ -877,8 +877,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  21.         ${SRCS_UNIXGTK})
  22.     set(LIBS
  23.         png
  24. -       ${GTHREAD2_LIBRARIES}
  25. -       ${PANGOCAIRO_LIBRARIES}
  26. +       gthread-2.0
  27. +       pangocairo-1.0
  28.         ${GTK2_LIBRARIES})
  29.  else()
  30.     add_definitions(-D__WXMSW__)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement