Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-24 16:20:05 +02:00
Code Issues Releases Wiki Activity

Revert "CopyLibs.cmake, for macOS: visit unique EDGES (not nodes)..."

Browse Source 
This reverts commit e785c77226da1cb33f97557e905caf4a579fa318.
This commit is contained in:
Paul Licameli 2021-06-08 20:48:46 -04:00
parent e2fda7df32
commit cf993fcded
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,8 +40,8 @@ endfunction()
set( VISITED ) set( VISITED )
function( gather_libs src ) function( gather_libs src )
list( APPEND VISITED "${src}" )
if( CMAKE_HOST_SYSTEM_NAME MATCHES "Windows" ) if( CMAKE_HOST_SYSTEM_NAME MATCHES "Windows" )
list( APPEND VISITED "${src}" )
execute( output cmd /k dumpbin /dependents ${src} ) execute( output cmd /k dumpbin /dependents ${src} )
foreach( line ${output} ) foreach( line ${output} )
@ -72,8 +72,7 @@ function( gather_libs src )
set( lib "${WXWIN}/${dylib_name}" ) set( lib "${WXWIN}/${dylib_name}" )
if( NOT lib STREQUAL "${src}" AND NOT line MATCHES "@executable" AND EXISTS "${lib}" if( NOT lib STREQUAL "${src}" AND NOT line MATCHES "@executable" AND EXISTS "${lib}"
AND NOT "${src}///${lib}" IN_LIST VISITED ) AND NOT "${lib}" IN_LIST VISITED )
list( APPEND VISITED "${src}///${lib}" )
message(STATUS "\tProcessing ${lib}...") message(STATUS "\tProcessing ${lib}...")
list( APPEND libs ${lib} ) list( APPEND libs ${lib} )
@ -89,7 +88,6 @@ function( gather_libs src )
endif() endif()
endforeach() endforeach()
elseif( CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" ) elseif( CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" )
list( APPEND VISITED "${src}" )
message(STATUS "Executing LD_LIBRARY_PATH='${WXWIN}' ldd ${src}") message(STATUS "Executing LD_LIBRARY_PATH='${WXWIN}' ldd ${src}")
execute( output sh -c "LD_LIBRARY_PATH='${WXWIN}' ldd ${src}" ) execute( output sh -c "LD_LIBRARY_PATH='${WXWIN}' ldd ${src}" )