1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-29 15:19:44 +02:00

10 Commits

Author SHA1 Message Date
Paul Licameli
4a2fc192e6 Bug2799: mod-script-pipe fails to load on Mac...
... This broke at commit 938bbeb with changes in CMake scripts.

This can be fixed by invoking CopyLibs.cmake for modules too.

This affects only the macOS build.
2021-06-09 15:06:21 -04:00
Paul Licameli
7346fdac69 Re-fix long Mac builds with many libraries, faster & more simply...
... Fix redundant "sh -c".  Combine many install_name_tool commands into one for
each library or executable.  Examine each with otool once only.
2021-06-09 15:06:21 -04:00
Paul Licameli
cf993fcded Revert "CopyLibs.cmake, for macOS: visit unique EDGES (not nodes)..."
This reverts commit e785c77226da1cb33f97557e905caf4a579fa318.
2021-06-09 15:06:21 -04:00
Paul Licameli
e785c77226 CopyLibs.cmake, for macOS: visit unique EDGES (not nodes)...
... in the graph of library dependencies.

Necessary to avoid crashes on startup loading dynamic libraries, but sufficient
to avoid excessive build times with many libraries.
2021-06-06 22:45:28 -04:00
Paul Licameli
e83c66ee50 Improve CopyLibs.cmake fix from 7d30537 for nonrecursive cases...
... When the graph of library dependencies is not recursive but complicated,
a combinatorial explosion of paths could make the post-build step not infinite
but very long (80 minutes in one of my experimental refactoring branches!)
2021-06-05 22:07:37 -04:00
Paul Licameli
7d30537374 Fix build time infinite recursion in CopyLibs.cmake 2021-06-03 09:40:48 -04:00
Dmitry Vedenko
4e6a1a81a9 Updates the way shared libraries are hadled
1. We put all shared libraries into one place. Both conan and locally built
2. We invoke CopyLibs to copy the libraries to a proper location and to correctly set the RPATH
Fixes CopyLibs script on Windows


Fixes CopyLibs.cmake for Linux

Fixes CopyLibs on macOS


Fixes CopyLibs on macOS
2021-05-26 12:46:45 +03:00
Dmitry Vedenko
8aca9d02de Add the first Conan-based dependecies
add_conan_lib cmake function is defined, that allows to add a dependency using Conan with two possible system fallbacks:

1. pkg_check_modules is invoked, if `PGK_CONFIG ...` is present
2. find_package is invoked if `FIND_PACKAGE_OPTIONS` is present and `pkg_check_modules` has failed

If `ALWAYS_ALLOW_CONAN_FALLBACK` is present - `obey_system_dependencies` will be ignored for the package

Currently, the following dependencies are retrieved using Conan:

* zlib
* expat
* wxwidgets
* libmp3lame
* libid3tag
* libmad

The last three libraries are included in this commit, as they depend on zlib.
Properly pass **arch** and **os.version** to Conan
2021-05-24 06:53:53 -07:00
Leland Lucius
2084c39046 Fix build Mac and Linux 2020-07-05 19:25:06 -05:00
Leland Lucius
c1407cdca9 Force use of our wxWidgets and fix RPATH handling 2020-07-05 13:39:57 -05:00