Fix Linux build: search for gthread-2.0 and pangocairo, then add both these libs to wx dependencies
This commit is contained in:
parent
c0992cc73e
commit
5242f09104
|
@ -508,6 +508,10 @@ if(NOT DISABLE_WX)
|
|||
add_definitions(-D__WXOSX_COCOA__)
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
add_definitions(-D__WXGTK__)
|
||||
|
||||
# Check for required libs
|
||||
check_lib(GTHREAD2 gthread-2.0 glib/gthread.h REQUIRED)
|
||||
check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED)
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
add_definitions(-D__WXMSW__)
|
||||
else()
|
||||
|
|
|
@ -875,6 +875,11 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|||
${SRCS_GTK}
|
||||
${SRCS_UNIX}
|
||||
${SRCS_UNIXGTK})
|
||||
set(LIBS
|
||||
png
|
||||
${GTHREAD2_LIBRARIES}
|
||||
${PANGOCAIRO_LIBRARIES}
|
||||
${GTK2_LIBRARIES})
|
||||
else()
|
||||
add_definitions(-D__WXMSW__)
|
||||
set(SRCS
|
||||
|
|
|
@ -63,8 +63,7 @@ if(wxWidgets_FOUND)
|
|||
Src/WiimoteConfigDiag.cpp
|
||||
Src/WxUtils.cpp)
|
||||
|
||||
set(WXLIBS ${wxWidgets_LIBRARIES}
|
||||
${GTK2_LIBRARIES})
|
||||
set(WXLIBS ${wxWidgets_LIBRARIES})
|
||||
else()
|
||||
set(SRCS Src/MainNoGUI.cpp)
|
||||
endif()
|
||||
|
|
Loading…
Reference in New Issue