-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[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.
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
Merged
[wxwidgets] Fix linux build #23765
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
5ccc45d
[wxwidgets] Fix linux build
5ac4d31
clean up baseline
a455055
version
bd9ab04
Fix --libs output
1ecb5e5
version
a890adf
Use system pkg-config on linux (#6)
dg0yt 6ffcf64
Revert baseline changes
e5e53c6
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
f8986a7
Add double quotes to paths
9c0363c
version
ae8a4dc
Fix incorrect double quotes place
a9d9140
version
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| 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() | ||
| diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake | ||
| index 91d11ac..2791466 100644 | ||
| --- a/build/cmake/config.cmake | ||
| +++ b/build/cmake/config.cmake | ||
| @@ -41,9 +41,27 @@ macro(wx_get_dependencies var lib) | ||
| endif() | ||
| set(dep_name "-l${dep_name}") | ||
| else() | ||
| - get_filename_component(dep_name ${dep} NAME) | ||
| + # For the value like $<$<CONFIG:DEBUG>:LIB_PATH> | ||
| + # Or $<$<NOT:$<CONFIG:DEBUG>>:LIB_PATH> | ||
| + string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) | ||
| + if (NOT dep_name) | ||
| + set(dep_name ${dep}) | ||
| + endif() | ||
| + endif() | ||
| + if(dep_name STREQUAL "libc.so") | ||
| + # don't include this library | ||
| + elseif(dep_name MATCHES "^-(.*)$") # -l, -framework, -weak_framework | ||
| + wx_string_append(${var} "${dep_name} ") | ||
| + elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") | ||
| + wx_string_append(${var} "-l${CMAKE_MATCH_1} ") | ||
| + elseif(dep_name) | ||
| + get_filename_component(abs_path ${dep_name} PATH) | ||
| + if (abs_path) # value contains path | ||
| + wx_string_append(${var} "${dep_name} ") | ||
| + else() | ||
| + wx_string_append(${var} "-l${dep_name} ") | ||
| + endif() | ||
| endif() | ||
| - wx_string_append(${var} "${dep_name} ") | ||
| endforeach() | ||
| string(STRIP ${${var}} ${var}) | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.