Skip to content

[wxwidgets] Fix linux build #23765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 12 commits into from
Mar 31, 2022
Merged

[wxwidgets] Fix linux build #23765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ccc45d
[wxwidgets] Fix linux build
Mar 25, 2022
5ac4d31
clean up baseline
Mar 25, 2022
a455055
version
Mar 25, 2022
bd9ab04
Fix --libs output
Mar 25, 2022
1ecb5e5
version
Mar 25, 2022
a890adf
Use system pkg-config on linux (#6)
dg0yt Mar 28, 2022
6ffcf64
Revert baseline changes
Mar 28, 2022
e5e53c6
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Mar 29, 2022
f8986a7
Add double quotes to paths
Mar 29, 2022
9c0363c
version
Mar 29, 2022
ae8a4dc
Fix incorrect double quotes place
Mar 29, 2022
a9d9140
version
Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ports/wxwidgets/fix-linux-configure.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake
index bb69643..09b52a6 100644
--- a/build/cmake/modules/cotire.cmake
+++ b/build/cmake/modules/cotire.cmake
@@ -2316,6 +2316,10 @@ function (cotire_generate_target_script _language _configurations _target _targe
"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig})
cotire_get_target_compiler_flags(
"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig})
+ string(REPLACE
+ "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>"
+ COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig} "${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}}"
+ )
cotire_get_source_files_compile_definitions(
"${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources})
endforeach()
1 change: 1 addition & 0 deletions ports/wxwidgets/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
disable-platform-lib-dir.patch
fix-build.patch
fix-linux-configure.patch # Remove this patch in the next update
)

set(OPTIONS)
Expand Down
3 changes: 2 additions & 1 deletion ports/wxwidgets/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "wxwidgets",
"version-semver": "3.1.5",
"port-version": 7,
"port-version": 8,
"description": [
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
"Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option."
],
"homepage": "https://github.com/wxWidgets/wxWidgets",
"license": "wxWindows",
"supports": "!uwp",
"dependencies": [
"expat",
Expand Down