From de0cca78d6c7b75d8e72061462f39ac5cd333d49 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 18:29:26 +0200 Subject: [PATCH 01/12] CMake: Only define WXMAC and WXOSX when building cocoa toolkit These should not be defined when building with gtk toolkit. See #23475 --- build/cmake/toolkit.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake index f3ca9a1d1d..3c706989af 100644 --- a/build/cmake/toolkit.cmake +++ b/build/cmake/toolkit.cmake @@ -143,7 +143,7 @@ if(WXQT) endif() endif() -if(APPLE) +if(wxBUILD_TOOLKIT MATCHES "osx_cocoa") list(APPEND wxTOOLKIT_DEFINITIONS __WXMAC__ __WXOSX__) endif() From 4d68b8ea4cef3a3c21bf9fcf985a7a98e5cb89c2 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 18:30:29 +0200 Subject: [PATCH 02/12] CMake: Fix joystick.h include check It should also be checked when building gtk toolkit on macOS. See #23475 --- build/cmake/setup.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index ff10584d08..6b0f6b8e02 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -392,7 +392,7 @@ if(UNIX) check_symbol_exists(inet_addr arpa/inet.h HAVE_INET_ADDR) endif(wxUSE_SOCKETS) - if(wxUSE_JOYSTICK AND NOT APPLE) + if(wxUSE_JOYSTICK AND WXGTK) check_include_files("linux/joystick.h" HAVE_JOYSTICK_H) if(NOT HAVE_JOYSTICK_H) message(WARNING "wxJoystick is not available") From b4ab993c27248276b5a8c2f36235bab03adead36 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 18:33:39 +0200 Subject: [PATCH 03/12] CMake: Expose used CURL libraries Try to fix #22860 --- build/cmake/lib/net/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/lib/net/CMakeLists.txt b/build/cmake/lib/net/CMakeLists.txt index 169c46b8ad..d24e83570c 100644 --- a/build/cmake/lib/net/CMakeLists.txt +++ b/build/cmake/lib/net/CMakeLists.txt @@ -31,5 +31,5 @@ endif() if (wxUSE_WEBREQUEST_CURL) wx_lib_include_directories(wxnet ${CURL_INCLUDE_DIRS}) - wx_lib_link_libraries(wxnet PRIVATE ${CURL_LIBRARIES}) + wx_lib_link_libraries(wxnet PUBLIC ${CURL_LIBRARIES}) endif() From bcf041d9c3c30127019938093259a842a8cadc41 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 17:18:43 +0200 Subject: [PATCH 04/12] CMake: Add options to specify custom install directories Specify wxBUILD_INSTALL_RUNTIME_DIR to use a custom directory for the runtime artifacts Specify wxBUILD_INSTALL_LIBRARY_DIR to use a custom directory for the library artifacts Specify wxBUILD_INSTALL_ARCHIVE_DIR to use a custom directory for the archive artifacts Set wxBUILD_INSTALL_PLATFORM_SUBDIR to false to not use the default msvc library sub-directory (like vc_x64_dll) See #23527 --- build/cmake/functions.cmake | 32 ++++++++++++++++++++++++++------ build/cmake/options.cmake | 10 ++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 9f1a2df14e..96dbad2882 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -421,6 +421,21 @@ function(wx_set_target_properties target_name) wx_set_common_target_properties(${target_name}) endfunction() +macro(wx_get_install_dir artifact default) + string(TOUPPER ${artifact} artifact_upper) + if(wxBUILD_INSTALL_${artifact_upper}_DIR) + set(${artifact}_dir "${wxBUILD_INSTALL_${artifact_upper}_DIR}") + else() + set(${artifact}_dir ${default}) + endif() + if(wxBUILD_INSTALL_PLATFORM_SUBDIR) + if(${artifact}_dir) + wx_string_append(${artifact}_dir ${GEN_EXPR_DIR}) + endif() + wx_string_append(${artifact}_dir "${wxPLATFORM_LIB_DIR}") + endif() +endmacro() + # List of libraries added via wx_add_library() to use for wx-config set(wxLIB_TARGETS) @@ -466,17 +481,22 @@ macro(wx_add_library name) # Setup install if(MSYS OR CYGWIN) # configure puts the .dll in the bin directory - set(runtime_dir "bin") + set(runtime_default_dir "bin") else() - set(runtime_dir "lib") + set(runtime_default_dir "lib") endif() + + wx_get_install_dir(library "lib") + wx_get_install_dir(archive "lib") + wx_get_install_dir(runtime "${runtime_default_dir}") + wx_install(TARGETS ${name} EXPORT wxWidgetsTargets - LIBRARY DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" - ARCHIVE DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" - RUNTIME DESTINATION "${runtime_dir}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" + LIBRARY DESTINATION "${library_dir}" + ARCHIVE DESTINATION "${archive_dir}" + RUNTIME DESTINATION "${runtime_dir}" BUNDLE DESTINATION Applications/wxWidgets - ) + ) wx_target_enable_precomp(${name} "${wxSOURCE_DIR}/include/wx/wxprec.h") endif() endmacro() diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 6f8e820483..85d92889ee 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -76,6 +76,16 @@ wx_option(wxBUILD_PIC "Enable position independent code (PIC)." ON) mark_as_advanced(wxBUILD_PIC) wx_option(wxUSE_NO_RTTI "disable RTTI support" OFF) +set(wxBUILD_INSTALL_RUNTIME_DIR "" CACHE PATH "override default sub-directory to install runtime files") +mark_as_advanced(wxBUILD_INSTALL_RUNTIME_DIR) +set(wxBUILD_INSTALL_LIBRARY_DIR "" CACHE PATH "override default sub-directory to install library files") +mark_as_advanced(wxBUILD_INSTALL_LIBRARY_DIR) +set(wxBUILD_INSTALL_ARCHIVE_DIR "" CACHE PATH "override default sub-directory to install archive files") +mark_as_advanced(wxBUILD_INSTALL_ARCHIVE_DIR) +wx_option(wxBUILD_INSTALL_PLATFORM_SUBDIR "platform specific sub-directory (MSVC-naming)" ON) +mark_as_advanced(wxBUILD_INSTALL_PLATFORM_SUBDIR) + + # STL options wx_option(wxUSE_STD_IOSTREAM "use standard C++ streams" ON) wx_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" ON) From 9dfb25adcf6df0e0c0240cb339c00ae2b1f7f833 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 17:20:44 +0200 Subject: [PATCH 05/12] CMake: Add option to enable installing PDB files Fixes #23884 --- build/cmake/functions.cmake | 5 +++++ build/cmake/options.cmake | 2 ++ 2 files changed, 7 insertions(+) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 96dbad2882..8c2be7edbb 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -497,6 +497,11 @@ macro(wx_add_library name) RUNTIME DESTINATION "${runtime_dir}" BUNDLE DESTINATION Applications/wxWidgets ) + + if(wxBUILD_SHARED AND MSVC AND wxBUILD_INSTALL_PDB) + wx_install(FILES $ DESTINATION "${runtime_dir}") + endif() + wx_target_enable_precomp(${name} "${wxSOURCE_DIR}/include/wx/wxprec.h") endif() endmacro() diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 85d92889ee..86d798c010 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -84,6 +84,8 @@ set(wxBUILD_INSTALL_ARCHIVE_DIR "" CACHE PATH "override default sub-directory to mark_as_advanced(wxBUILD_INSTALL_ARCHIVE_DIR) wx_option(wxBUILD_INSTALL_PLATFORM_SUBDIR "platform specific sub-directory (MSVC-naming)" ON) mark_as_advanced(wxBUILD_INSTALL_PLATFORM_SUBDIR) +wx_option(wxBUILD_INSTALL_PDB "install pdb files in the runtime direcotry (MSVC)" OFF) +mark_as_advanced(wxBUILD_INSTALL_PDB) # STL options From 0c725cdaea3bcce97c76f8b7937df3a6da924795 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 17:21:52 +0200 Subject: [PATCH 06/12] CMake: Only install headers required by the used toolkit See #22714 --- build/cmake/functions.cmake | 16 ++++++++++++++-- build/cmake/install.cmake | 12 +++++++++--- build/cmake/lib/CMakeLists.txt | 1 + 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 8c2be7edbb..81d67dfb0b 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -21,6 +21,12 @@ else() endif() +# List of libraries added via wx_add_library() to use for wx-config +# and headers added via wx_append_sources() to use for install. +set(wxLIB_TARGETS) +set(wxINSTALL_HEADERS) + + # This function adds a list of headers to a variable while prepending # include/ to the path macro(wx_add_headers src_var) @@ -52,6 +58,14 @@ macro(wx_append_sources src_var source_base_name) endif() if(DEFINED ${source_base_name}_HDR) wx_add_headers(${src_var} ${${source_base_name}_HDR}) + + list(APPEND wxINSTALL_HEADERS ${${source_base_name}_HDR}) + set(wxINSTALL_HEADERS ${wxINSTALL_HEADERS} PARENT_SCOPE) + endif() + + if(DEFINED ${source_base_name}_RSC) + list(APPEND wxINSTALL_HEADERS ${${source_base_name}_RSC}) + set(wxINSTALL_HEADERS ${wxINSTALL_HEADERS} PARENT_SCOPE) endif() endmacro() @@ -436,8 +450,6 @@ macro(wx_get_install_dir artifact default) endif() endmacro() -# List of libraries added via wx_add_library() to use for wx-config -set(wxLIB_TARGETS) # Add a wxWidgets library # wx_add_library( [IS_BASE;IS_PLUGIN;IS_MONO] ...) diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index 384c6837b8..a02e0eb3ac 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -12,9 +12,15 @@ if(NOT wxBUILD_INSTALL) endif() install(CODE "message(STATUS \"Installing: Headers...\")") -install( - DIRECTORY "${wxSOURCE_DIR}/include/wx" - DESTINATION "${wxINSTALL_INCLUDE_DIR}") + +foreach(header ${wxINSTALL_HEADERS}) + get_filename_component(path "${header}" PATH) + install( + FILES "${wxSOURCE_DIR}/include/${header}" + DESTINATION "${wxINSTALL_INCLUDE_DIR}/${path}" + ) +endforeach() + if(MSVC) install( DIRECTORY "${wxSOURCE_DIR}/include/msvc" diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index bd234dc13c..04d830d7de 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -110,3 +110,4 @@ endif() # Propagate variable(s) to parent scope set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE) +set(wxINSTALL_HEADERS ${wxINSTALL_HEADERS} PARENT_SCOPE) From 20f49d6c59c6be4c79fe6eefc9073ab64cb2b2b7 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 4 Sep 2024 17:14:41 +0200 Subject: [PATCH 07/12] CMake: Add target to create and install locale files See #24287 --- build/cmake/locale.cmake | 36 ++++++++++++++++++++++++++++++++++++ build/cmake/main.cmake | 1 + build/cmake/options.cmake | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 build/cmake/locale.cmake diff --git a/build/cmake/locale.cmake b/build/cmake/locale.cmake new file mode 100644 index 0000000000..1bac4c2fb3 --- /dev/null +++ b/build/cmake/locale.cmake @@ -0,0 +1,36 @@ +if(wxBUILD_LOCALES STREQUAL "AUTO") + find_package(Gettext QUIET) +elseif(wxBUILD_LOCALES) + find_package(Gettext REQUIRED) +endif() + +mark_as_advanced(GETTEXT_MSGMERGE_EXECUTABLE) +mark_as_advanced(GETTEXT_MSGFMT_EXECUTABLE) + +if(NOT GETTEXT_FOUND OR wxBUILD_LOCALES STREQUAL "OFF") + return() +endif() + +# list and process the po files +file(GLOB _po_files "${wxSOURCE_DIR}/locale/*.po") +foreach(_po_file ${_po_files}) + get_filename_component(name "${_po_file}" NAME) + string(REGEX REPLACE "\\.[^.]*$" "" lang ${name}) + + gettext_process_po_files(${lang} ALL PO_FILES "${_po_file}") + + wx_install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo" + DESTINATION "share/locale/${lang}/LC_MESSAGES" + RENAME "wxstd-${wxMAJOR_VERSION}.${wxMINOR_VERSION}.mo" + ) +endforeach() + +# put all pofiles targets in a group to not clutter visual studio +set(base_name "pofiles") +set(target_index 0) +set(target_name ${base_name}) +while(TARGET ${target_name}) + set_target_properties(${target_name} PROPERTIES FOLDER "Locales") + math(EXPR target_index "${target_index}+1") + set(target_name "${base_name}_${target_index}") +endwhile() diff --git a/build/cmake/main.cmake b/build/cmake/main.cmake index f6b0ec553e..9dc1b06997 100644 --- a/build/cmake/main.cmake +++ b/build/cmake/main.cmake @@ -16,6 +16,7 @@ include(build/cmake/toolkit.cmake) # Platform/toolkit settings include(build/cmake/options.cmake) # User options include(build/cmake/init.cmake) # Init various global build vars include(build/cmake/pch.cmake) # Precompiled header support +include(build/cmake/locale.cmake) # Locale files add_subdirectory(build/cmake/lib libs) add_subdirectory(build/cmake/utils utils) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 86d798c010..c3cff130d9 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -16,6 +16,8 @@ wx_option(wxBUILD_TESTS "Build console tests (CONSOLE_ONLY) or ALL" OFF STRINGS CONSOLE_ONLY ALL OFF) wx_option(wxBUILD_DEMOS "Build demos" OFF) wx_option(wxBUILD_BENCHMARKS "Build benchmarks" OFF) +wx_option(wxBUILD_LOCALES "Build locales" AUTO STRINGS ON OFF AUTO) +mark_as_advanced(wxBUILD_LOCALES) wx_option(wxBUILD_PRECOMP "Use precompiled headers" ON STRINGS ON OFF COTIRE) mark_as_advanced(wxBUILD_PRECOMP) wx_option(wxBUILD_INSTALL "Create install/uninstall target for wxWidgets") From 0c3a52d9e8ebd9ef676bd9775199ef236288d1cb Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 28 Dec 2024 17:05:18 +0100 Subject: [PATCH 08/12] CMake: Include more source groups from files.cmake --- build/cmake/lib/base/CMakeLists.txt | 10 +++++++--- build/cmake/lib/core/CMakeLists.txt | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt index d8c587994b..7f60e93f52 100644 --- a/build/cmake/lib/base/CMakeLists.txt +++ b/build/cmake/lib/base/CMakeLists.txt @@ -14,9 +14,13 @@ if(WIN32) wx_append_sources(BASE_FILES BASE_WIN32) wx_append_sources(BASE_FILES BASE_AND_GUI_WIN32) elseif(APPLE) - wx_append_sources(BASE_FILES BASE_OSX_SHARED) - if(WXOSX_COCOA) - wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA) + if(WXOSX_COCOA OR WXOSX_IPHONE) + wx_append_sources(BASE_FILES BASE_OSX_SHARED) + if(WXOSX_COCOA) + wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA) + endif() + else() + wx_append_sources(BASE_FILES BASE_OSX_NOTWXMAC) endif() elseif(UNIX) wx_append_sources(BASE_FILES BASE_UNIX) diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 22f523a65e..a2d47b9867 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -28,6 +28,7 @@ if(WXMSW) endif() elseif(WXGTK) if(WXGTK2) + set(GTK2_LOWLEVEL_HDR ${GTK_LOWLEVEL_HDR}) wx_append_sources(CORE_SRC GTK2_LOWLEVEL) wx_append_sources(CORE_SRC GTK2) else() @@ -47,6 +48,7 @@ elseif(WXOSX_COCOA) wx_append_sources(CORE_SRC OSX_COCOA) elseif(WXOSX_IPHONE) wx_append_sources(CORE_SRC OSX_LOWLEVEL) + wx_append_sources(CORE_SRC OSX_SHARED) wx_append_sources(CORE_SRC OSX_IPHONE) elseif(WXQT) wx_append_sources(CORE_SRC QT) From 4ac91d2836c4fc7d0ebdb5974f7cb394f84443cf Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 28 Dec 2024 17:06:52 +0100 Subject: [PATCH 09/12] CMake: Silence compatibility warnings --- CMakeLists.txt | 2 +- samples/minimal/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78a7ef6a76..0d2d0d3d40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # Licence: wxWindows licence ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.5...3.31) if(NOT CMAKE_CONFIGURATION_TYPES) get_property(HAVE_MULTI_CONFIG_GENERATOR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/samples/minimal/CMakeLists.txt b/samples/minimal/CMakeLists.txt index 6a917ef5ab..dc7dc53a4c 100644 --- a/samples/minimal/CMakeLists.txt +++ b/samples/minimal/CMakeLists.txt @@ -14,7 +14,7 @@ # # Declare the minimum required CMake version -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.5...3.31) if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) # If no deployment target has been set default to the minimum supported From fd9d6b4d29c70979134271349a4fb4373a2c9467 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 28 Dec 2024 17:07:55 +0100 Subject: [PATCH 10/12] CMake: Fix missing custom command type --- build/cmake/functions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 81d67dfb0b..7cbee1d15e 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -920,7 +920,7 @@ function(wx_add name group) ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_dst}) endforeach() add_custom_command( - TARGET ${target_name} ${cmds} + TARGET ${target_name} POST_BUILD ${cmds} COMMENT "Copying ${target_name} data files...") endif() From f3766bea3f22c851ec93c42d2b8088e2f886c207 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 28 Dec 2024 23:57:39 +0100 Subject: [PATCH 11/12] CMake: Fix installing to correct directory Update path-style of CMAKE_INSTALL_PREFIX after the project is created, otherwise it might not be initialized --- CMakeLists.txt | 2 -- build/cmake/main.cmake | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d2d0d3d40..7e2ea2ed1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES) endif() endif() -file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX) - # https://blog.kitware.com/cmake-and-the-default-build-type/ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(default_build_type "Debug") diff --git a/build/cmake/main.cmake b/build/cmake/main.cmake index 9dc1b06997..1031a3e092 100644 --- a/build/cmake/main.cmake +++ b/build/cmake/main.cmake @@ -9,6 +9,8 @@ list(APPEND CMAKE_MODULE_PATH "${wxSOURCE_DIR}/build/cmake/modules") +file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX) + include(build/cmake/files.cmake) # Files list include(build/cmake/source_groups.cmake) # Source group definitions include(build/cmake/functions.cmake) # wxWidgets functions From c3e21a04e0eef99aa22c57a71e44ceeabe688999 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Fri, 3 Jan 2025 17:04:49 +0100 Subject: [PATCH 12/12] CMake: Install MSVC props --- build/cmake/install.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index a02e0eb3ac..202d0541af 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -24,7 +24,16 @@ endforeach() if(MSVC) install( DIRECTORY "${wxSOURCE_DIR}/include/msvc" - DESTINATION "${wxINSTALL_INCLUDE_DIR}") + DESTINATION "${wxINSTALL_INCLUDE_DIR}" + ) + install( + FILES "${wxSOURCE_DIR}/wxwidgets.props" + DESTINATION "." + ) + install( + FILES "${wxSOURCE_DIR}/build/msw/wx_setup.props" + DESTINATION "build/msw" + ) endif() # setup header and wx-config