Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move GTK+/Win32 libraries list to toolkit.cmake file

Browse Source
This commit is contained in:
Kolya Kosenko
2018-03-01 01:16:06 +02:00
parent d6a284783a
commit eb3971c199
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build/cmake/functions.cmake
View File

@@ -226,37 +226,6 @@ function(wx_set_target_properties target_name is_base)
) )
target_link_libraries(${target_name} target_link_libraries(${target_name}
PUBLIC ${WIN32_LIBRARIES}) PUBLIC ${WIN32_LIBRARIES})
if(WXGTK)
if(WXGTK4)
set(WXGTK_WIN32_LIBRARIES
libgtk-4.dll.a
libgdk-4.dll.a
)
elseif(WXGTK3)
set(WXGTK_WIN32_LIBRARIES
libgtk-3.dll.a
libgdk-3.dll.a
)
elseif(WXGTK2)
set(WXGTK_WIN32_LIBRARIES
gtk-win32-2.0.lib
gdk-win32-2.0.lib
)
endif()
set(WXGTK_WIN32_LIBRARIES ${WXGTK_WIN32_LIBRARIES}
gio-2.0.lib
pangocairo-1.0.lib
gdk_pixbuf-2.0.lib
cairo.lib
pango-1.0.lib
gobject-2.0.lib
gthread-2.0.lib
glib-2.0.lib
)
target_link_libraries(${target_name}
PUBLIC ${WXGTK_WIN32_LIBRARIES})
endif()
endif() endif()
if(wxTOOLKIT_LIBRARIES) if(wxTOOLKIT_LIBRARIES)

29
build/cmake/toolkit.cmake
View File

@@ -82,6 +82,35 @@ if(WXGTK)
list(APPEND wxTOOLKIT_DEFINITIONS ${${gtk_lib}_DEFINITIONS}) list(APPEND wxTOOLKIT_DEFINITIONS ${${gtk_lib}_DEFINITIONS})
list(APPEND wxTOOLKIT_DEFINITIONS __WXGTK__) list(APPEND wxTOOLKIT_DEFINITIONS __WXGTK__)
set(wxTOOLKIT_VERSION ${${gtk_lib}_VERSION}) set(wxTOOLKIT_VERSION ${${gtk_lib}_VERSION})
if(WIN32 AND MSVC)
if(WXGTK4)
list(APPEND wxTOOLKIT_LIBRARIES
libgtk-4.dll.a
libgdk-4.dll.a
)
elseif(WXGTK3)
list(APPEND wxTOOLKIT_LIBRARIES
libgtk-3.dll.a
libgdk-3.dll.a
)
elseif(WXGTK2)
list(APPEND wxTOOLKIT_LIBRARIES
gtk-win32-2.0
gdk-win32-2.0
)
endif()
list(APPEND wxTOOLKIT_LIBRARIES
gio-2.0
pangocairo-1.0
gdk_pixbuf-2.0
cairo
pango-1.0
gobject-2.0
gthread-2.0
glib-2.0
)
endif()
endif() endif()
if(APPLE) if(APPLE)