diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index d1be3d74fd..bb67ce841f 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -432,40 +432,25 @@ macro(wx_add_library name) BUNDLE DESTINATION Applications/wxWidgets ) wx_install(EXPORT ${name}Targets NAMESPACE wx:: DESTINATION "lib/${wxPLATFORM_LIB_DIR}/cmake") + wx_target_enable_precomp(${name} "${wxSOURCE_DIR}/include/wx/wxprec.h") endif() endmacro() # Enable cotire for target, use optional second argument for prec. header macro(wx_target_enable_precomp target_name) - target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) - if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") - set_target_properties(${target_name} PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) - endif() - set_target_properties(${target_name} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) - cotire(${target_name}) -endmacro() - -# Enable precompiled headers for applications -macro(wx_app_enable_precomp target_name) if(wxBUILD_PRECOMP) - wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h") + target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) + if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") + set_target_properties(${target_name} PROPERTIES + COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) + endif() + set_target_properties(${target_name} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) + cotire(${target_name}) elseif(MSVC) target_compile_definitions(${target_name} PRIVATE NOPCH) endif() endmacro() -# Enable precompiled headers for wx libraries -macro(wx_finalize_lib target_name) - if(wxBUILD_PRECOMP) - if(TARGET ${target_name}) - wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h") - endif() - elseif(MSVC) - wx_lib_compile_definitions(${target_name} PRIVATE NOPCH) - endif() -endmacro() - # wx_lib_link_libraries(name []) # Forwards everything to target_link_libraries() except for monolithic # build where it collects all libraries for linking with the mono lib @@ -882,7 +867,7 @@ function(wx_add name group) set(APP_FOLDER ${group}) endif() wx_set_common_target_properties(${target_name}) - wx_app_enable_precomp(${target_name}) + wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h") set_target_properties(${target_name} PROPERTIES FOLDER ${APP_FOLDER} ) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 9fc8b1842a..d270c2899a 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -96,7 +96,6 @@ if(wxBUILD_MONOLITHIC) set_source_files_properties(${file} PROPERTIES HEADER_FILE_ONLY TRUE) endforeach() wx_webview_copy_webview2_loader(wxmono) - wx_finalize_lib(wxmono) endif() # Propagate variable(s) to parent scope diff --git a/build/cmake/lib/adv/CMakeLists.txt b/build/cmake/lib/adv/CMakeLists.txt index e3e5459f08..c00e69abb5 100644 --- a/build/cmake/lib/adv/CMakeLists.txt +++ b/build/cmake/lib/adv/CMakeLists.txt @@ -10,5 +10,3 @@ include(../../source_groups.cmake) wx_add_library(wxadv "${wxSOURCE_DIR}/src/common/dummy.cpp") - -wx_finalize_lib(wxadv) diff --git a/build/cmake/lib/aui/CMakeLists.txt b/build/cmake/lib/aui/CMakeLists.txt index ef488e5768..f24b674bc7 100644 --- a/build/cmake/lib/aui/CMakeLists.txt +++ b/build/cmake/lib/aui/CMakeLists.txt @@ -18,5 +18,3 @@ elseif(WXGTK2) endif() wx_add_library(wxaui ${AUI_FILES}) - -wx_finalize_lib(wxaui) diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt index 33d146cf73..9f4a472813 100644 --- a/build/cmake/lib/base/CMakeLists.txt +++ b/build/cmake/lib/base/CMakeLists.txt @@ -73,5 +73,3 @@ if(APPLE) elseif(UNIX) wx_lib_link_libraries(wxbase PRIVATE dl) endif() - -wx_finalize_lib(wxbase) diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 392886b276..ad456924e7 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -105,5 +105,3 @@ if(wxUSE_LIBNOTIFY) wx_lib_include_directories(wxcore ${LIBNOTIFY_INCLUDE_DIRS}) wx_lib_link_libraries(wxcore PUBLIC ${LIBNOTIFY_LIBRARIES}) endif() - -wx_finalize_lib(wxcore) diff --git a/build/cmake/lib/gl/CMakeLists.txt b/build/cmake/lib/gl/CMakeLists.txt index 02238d9747..550a37c53d 100644 --- a/build/cmake/lib/gl/CMakeLists.txt +++ b/build/cmake/lib/gl/CMakeLists.txt @@ -26,5 +26,3 @@ endif() wx_add_library(wxgl ${GL_FILES}) wx_lib_include_directories(wxgl ${OPENGL_INCLUDE_DIR}) wx_lib_link_libraries(wxgl PUBLIC ${OPENGL_LIBRARIES}) - -wx_finalize_lib(wxgl) diff --git a/build/cmake/lib/html/CMakeLists.txt b/build/cmake/lib/html/CMakeLists.txt index 8dc3c76a0c..d364d891c7 100644 --- a/build/cmake/lib/html/CMakeLists.txt +++ b/build/cmake/lib/html/CMakeLists.txt @@ -21,5 +21,3 @@ if(wxUSE_LIBMSPACK) wx_lib_include_directories(wxhtml ${MSPACK_INCLUDE_DIRS}) wx_lib_link_libraries(wxhtml PRIVATE ${MSPACK_LIBRARIES}) endif() - -wx_finalize_lib(wxhtml) diff --git a/build/cmake/lib/media/CMakeLists.txt b/build/cmake/lib/media/CMakeLists.txt index 0f1d9ae847..fd28b06dbc 100644 --- a/build/cmake/lib/media/CMakeLists.txt +++ b/build/cmake/lib/media/CMakeLists.txt @@ -53,5 +53,3 @@ elseif(WXGTK) wx_lib_link_libraries(wxmedia PUBLIC ${GSTREAMER_PLAYER_LIBRARIES}) endif() endif() - -wx_finalize_lib(wxmedia) diff --git a/build/cmake/lib/net/CMakeLists.txt b/build/cmake/lib/net/CMakeLists.txt index 2fb8197ef2..57719c6c82 100644 --- a/build/cmake/lib/net/CMakeLists.txt +++ b/build/cmake/lib/net/CMakeLists.txt @@ -35,5 +35,3 @@ if (wxUSE_WEBREQUEST_CURL) target_include_directories(wxnet PRIVATE ${CURL_INCLUDE_DIRS}) wx_lib_link_libraries(wxnet PRIVATE ${CURL_LIBRARIES}) endif() - -wx_finalize_lib(wxnet) diff --git a/build/cmake/lib/propgrid/CMakeLists.txt b/build/cmake/lib/propgrid/CMakeLists.txt index d785c8c268..95cb8f1e58 100644 --- a/build/cmake/lib/propgrid/CMakeLists.txt +++ b/build/cmake/lib/propgrid/CMakeLists.txt @@ -12,5 +12,3 @@ include(../../source_groups.cmake) wx_append_sources(PROPGRID_FILES PROPGRID) wx_add_library(wxpropgrid ${PROPGRID_FILES}) - -wx_finalize_lib(wxpropgrid) diff --git a/build/cmake/lib/qa/CMakeLists.txt b/build/cmake/lib/qa/CMakeLists.txt index 050287205e..2d33f35962 100644 --- a/build/cmake/lib/qa/CMakeLists.txt +++ b/build/cmake/lib/qa/CMakeLists.txt @@ -13,5 +13,3 @@ wx_append_sources(QA_FILES QA) wx_add_library(wxqa ${QA_FILES}) wx_lib_link_libraries(wxqa PUBLIC wxxml) - -wx_finalize_lib(wxqa) diff --git a/build/cmake/lib/ribbon/CMakeLists.txt b/build/cmake/lib/ribbon/CMakeLists.txt index 042fe6f836..2d07d3f73a 100644 --- a/build/cmake/lib/ribbon/CMakeLists.txt +++ b/build/cmake/lib/ribbon/CMakeLists.txt @@ -12,5 +12,3 @@ include(../../source_groups.cmake) wx_append_sources(RIBBON_FILES RIBBON) wx_add_library(wxribbon ${RIBBON_FILES}) - -wx_finalize_lib(wxribbon) diff --git a/build/cmake/lib/richtext/CMakeLists.txt b/build/cmake/lib/richtext/CMakeLists.txt index 63b1e5385c..ad85244e9f 100644 --- a/build/cmake/lib/richtext/CMakeLists.txt +++ b/build/cmake/lib/richtext/CMakeLists.txt @@ -13,5 +13,3 @@ wx_append_sources(RICHTEXT_FILES RICHTEXT) wx_add_library(wxrichtext ${RICHTEXT_FILES}) wx_lib_link_libraries(wxrichtext PRIVATE wxhtml wxxml) - -wx_finalize_lib(wxrichtext) diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt index 609b229c77..02e50c9758 100644 --- a/build/cmake/lib/stc/CMakeLists.txt +++ b/build/cmake/lib/stc/CMakeLists.txt @@ -198,5 +198,3 @@ wx_lib_link_libraries(wxstc PRIVATE wxscintilla) if(WXMSW) wx_lib_link_libraries(wxstc PRIVATE imm32) endif() - -wx_finalize_lib(wxstc) diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt index b83280cb73..7db79b6026 100644 --- a/build/cmake/lib/webview/CMakeLists.txt +++ b/build/cmake/lib/webview/CMakeLists.txt @@ -108,8 +108,6 @@ elseif(WXGTK) endif() endif() -wx_finalize_lib(wxwebview) - # webkit extension plugin # we can't use (all of the) macros and functions because this library should # always be build as a shared libary, and not included in the monolithic build. diff --git a/build/cmake/lib/xml/CMakeLists.txt b/build/cmake/lib/xml/CMakeLists.txt index c934fa2972..12dd3fed51 100644 --- a/build/cmake/lib/xml/CMakeLists.txt +++ b/build/cmake/lib/xml/CMakeLists.txt @@ -13,5 +13,3 @@ wx_append_sources(XML_FILES XML) wx_add_library(wxxml IS_BASE ${XML_FILES}) wx_lib_link_libraries(wxxml PRIVATE ${EXPAT_LIBRARIES}) wx_lib_include_directories(wxxml ${EXPAT_INCLUDE_DIRS}) - -wx_finalize_lib(wxxml) diff --git a/build/cmake/lib/xrc/CMakeLists.txt b/build/cmake/lib/xrc/CMakeLists.txt index 2897e93454..1196c35616 100644 --- a/build/cmake/lib/xrc/CMakeLists.txt +++ b/build/cmake/lib/xrc/CMakeLists.txt @@ -13,5 +13,3 @@ wx_append_sources(XRC_FILES XRC) wx_add_library(wxxrc ${XRC_FILES}) wx_lib_link_libraries(wxxrc PRIVATE wxhtml wxxml) - -wx_finalize_lib(wxxrc)