Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 15:11:12 +02:00
Code Issues Releases Wiki Activity

Fix build Mac and Linux

Browse Source
This commit is contained in:
Leland Lucius
2020-07-05 19:25:06 -05:00
parent 3d0e86a8f8
commit 2084c39046
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake-proxies/cmake-modules/CopyLibs.cmake
View File

@@ -8,7 +8,6 @@
#
message( "==================================================================" )
message( "Copying wxWidgets libraries:" )
message( "${SRC} ${DST}" )
message( "==================================================================" )
# list command no longer ignores empty elements.
@@ -62,7 +61,7 @@ function( gather_libs src )
foreach( line ${output} )
if( line MATCHES "^.*libwx.*\\.dylib " )
string( REGEX REPLACE "dylib .*" "dylib" line "${line}" )
if( NOT line STREQUAL "${src}" )
if( NOT line STREQUAL "${src}" AND NOT line MATCHES "@executable" )
set( lib ${line} )
list( APPEND libs ${lib} )
@@ -75,7 +74,9 @@ function( gather_libs src )
endif()
endforeach()
elseif( CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" )
execute( output ldd ${src} )
execute( output sh -c "LD_LIBRARY_PATH='${WXWIN}' ldd ${src}" )
get_filename_component( libname "${src}" NAME )
foreach( line ${output} )
if( line MATCHES ".*libwx.*" )