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

Completely remove "adv" library from CMake build system

Browse Source 
This build system is new and so doesn't need to keep "adv" for
compatibility.
This commit is contained in:
Vadim Zeitlin
2018-08-27 20:40:55 +02:00
parent 424bc34d9d
commit f71c4f55a3
10 changed files with 38 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/lib/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ add_opt_lib(net wxUSE_SOCKETS)
# Define UI libraries
if(wxUSE_GUI)
list(APPEND LIBS core adv)
list(APPEND LIBS core)
foreach(lib
aui
html

48
build/cmake/lib/adv/CMakeLists.txt
View File

@@ -1,48 +0,0 @@
#############################################################################
# Name: build/cmake/lib/adv/CMakeLists.txt
# Purpose: CMake file for adv library
# Author: Tobias Taschner
# Created: 2016-10-03
# Copyright: (c) 2016 wxWidgets development team
# Licence: wxWindows licence
#############################################################################
include(../../source_groups.cmake)
wx_append_sources(ADV_FILES ADVANCED_CMN)
if(WXMSW)
wx_append_sources(ADV_FILES ADVANCED_MSW)
wx_append_sources(ADV_FILES ADVANCED_MSW_NATIVE)
wx_append_sources(ADV_FILES ADVANCED_MSW_DESKTOP)
elseif(WXOSX_COCOA)
wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
elseif(WXGTK)
if(WXGTK2)
wx_append_sources(ADV_FILES ADVANCED_GTK2)
else()
wx_append_sources(ADV_FILES ADVANCED_GTK)
endif()
wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
if(WIN32)
wx_append_sources(ADV_FILES ADVANCED_GTK_WIN32)
endif()
endif()
if(UNIX AND NOT APPLE AND NOT WIN32)
wx_append_sources(ADV_FILES ADVANCED_UNIX)
endif()
wx_add_library(adv ${ADV_FILES})
if(WIN32)
wx_lib_link_libraries(adv PRIVATE
winmm
)
endif()
if(WXOSX_COCOA)
wx_lib_link_libraries(adv PUBLIC
"-framework AudioToolbox"
)
endif()
wx_finalize_lib(adv)

11
build/cmake/lib/core/CMakeLists.txt
View File

@@ -56,4 +56,15 @@ foreach(lib JPEG PNG TIFF)
endif()
endforeach()
if(WIN32)
wx_lib_link_libraries(core PRIVATE
winmm
)
endif()
if(WXOSX_COCOA)
wx_lib_link_libraries(core PUBLIC
"-framework AudioToolbox"
)
endif()
wx_finalize_lib(core)

1
build/cmake/lib/propgrid/CMakeLists.txt
View File

@@ -12,6 +12,5 @@ include(../../source_groups.cmake)
wx_append_sources(PROPGRID_FILES PROPGRID)
wx_add_library(propgrid ${PROPGRID_FILES})
wx_lib_link_libraries(propgrid PRIVATE adv)
wx_finalize_lib(propgrid)

2
build/cmake/lib/richtext/CMakeLists.txt
View File

@@ -12,6 +12,6 @@ include(../../source_groups.cmake)
wx_append_sources(RICHTEXT_FILES RICHTEXT)
wx_add_library(richtext ${RICHTEXT_FILES})
wx_lib_link_libraries(richtext PRIVATE adv html xml)
wx_lib_link_libraries(richtext PRIVATE html xml)
wx_finalize_lib(richtext)

2
build/cmake/lib/xrc/CMakeLists.txt
View File

@@ -12,6 +12,6 @@ include(../../source_groups.cmake)
wx_append_sources(XRC_FILES XRC)
wx_add_library(xrc ${XRC_FILES})
wx_lib_link_libraries(xrc PRIVATE adv html xml)
wx_lib_link_libraries(xrc PRIVATE html xml)
wx_finalize_lib(xrc)