Marcus Asteborg
2019-Apr-02 15:26 UTC
[opus] CMake support for Opus proposal (in addition to Autotools)
Hi,
Thanks for the quick feedback I have changed the name to avoid conflict.
Attached is the updated patch.
//Marcus
________________________________
From: Jean-Marc Valin <jmvalin at jmvalin.ca>
Sent: Tuesday, April 2, 2019 00:07
To: Marcus Asteborg; opus at xiph.org
Subject: Re: [opus] CMake support for Opus proposal (in addition to Autotools)
Hi Marcus,
There seems to be a conflict between the autotools-created config.h.in
and the same file added by your patch. Any way you can use use a
different name?
Cheers,
Jean-Marc
On 04/02/2019 01:39 AM, Marcus Asteborg wrote:> Hi,
>
>
> Here is a proposal for adding CMake in addition of Autotools.
>
>
> See the attached patch for changes or the pull request here:
>
https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r%2FAsFXvOjyWu44%3D&reserved=0
>
<https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r%2FAsFXvOjyWu44%3D&reserved=0>
>
>
> The CMake scripts are parsing the filelist from Autotools, so only one
> file list needs to be maintained.
>
>
> With this change the checked in Visual Studio solution can be removed
> and no longer need to be maintained and updated when Visual Studio is
> updated.
>
>
> For related discussion about CMake support see
>
https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds%2Bnlf9Qc%3D&reserved=0
<https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds%2Bnlf9Qc%3D&reserved=0>
>
>
> For any concerns, comments or questions regarding the change please
> comment in the pull request, reply to this thread or send me an e-mail.
>
>
> Related Issue:
>
>
https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=MUh7c1xua91%2Bvn8M33fbsTKS8%2FZeyZV02BorkANy6h4%3D&reserved=0
>
<https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328837885&sdata=rQA6M3kf87Zd%2Bc3IBVExdUWj8zKYMIzfTAePmrXDnwo%3D&reserved=0>
>
>
> //Marcus
>
>
>
>
> _______________________________________________
> opus mailing list
> opus at xiph.org
>
https://nam01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.xiph.org%2Fmailman%2Flistinfo%2Fopus&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328837885&sdata=xTw1jcE0ABlREHtDX5ycQXcrYnzQijLEWJ2LZk6JPEk%3D&reserved=0
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20190402/97d29304/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Adding-CMake-support-for-Windows-Mac-Linux-and-Andro.patch
Type: application/octet-stream
Size: 28898 bytes
Desc: 0002-Adding-CMake-support-for-Windows-Mac-Linux-and-Andro.patch
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20190402/97d29304/attachment-0001.obj>
Jean-Marc Valin
2019-Apr-02 18:38 UTC
[opus] CMake support for Opus proposal (in addition to Autotools)
Thanks, it applies now. I think you'd also want to add some (all?) of these files to EXTRA_DIST in Makefile.am, otherwise your cmake files won't be included in release tarballs, which are generate using "make dist". To test, you should try running run "make dist" to generate a tarball yourself. From there, you try building the contents with your cmake files and see if it works. Cheers, Jean-Marc On 04/02/2019 11:26 AM, Marcus Asteborg wrote:> Hi, > > Thanks for the quick feedback I have changed the name to avoid conflict. > > Attached is the updated patch. > > //Marcus > ------------------------------------------------------------------------ > *From:* Jean-Marc Valin <jmvalin at jmvalin.ca> > *Sent:* Tuesday, April 2, 2019 00:07 > *To:* Marcus Asteborg; opus at xiph.org > *Subject:* Re: [opus] CMake support for Opus proposal (in addition to > Autotools) > > Hi Marcus, > > There seems to be a conflict between the autotools-created config.h.in > and the same file added by your patch. Any way you can use use a > different name? > > Cheers, > > Jean-Marc > > On 04/02/2019 01:39 AM, Marcus Asteborg wrote: >> Hi, >> >> >> Here is a proposal for adding CMake in addition of Autotools. >> >> >> See the attached patch for changes or the pull request here: >> https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r%2FAsFXvOjyWu44%3D&reserved=0 >> <https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r%2FAsFXvOjyWu44%3D&reserved=0> >> >> >> The CMake scripts are parsing the filelist from Autotools, so only one >> file list needs to be maintained. >> >> >> With this change the checked in Visual Studio solution can be removed >> and no longer need to be maintained and updated when Visual Studio is >> updated. >> >> >> For related discussion about CMake support see >> https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds%2Bnlf9Qc%3D&reserved=0 > <https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds%2Bnlf9Qc%3D&reserved=0> >> >> >> For any concerns, comments or questions regarding the change please >> comment in the pull request, reply to this thread or send me an e-mail. >> >> >> Related Issue: >> >> https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328827874&sdata=MUh7c1xua91%2Bvn8M33fbsTKS8%2FZeyZV02BorkANy6h4%3D&reserved=0 >> <https://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328837885&sdata=rQA6M3kf87Zd%2Bc3IBVExdUWj8zKYMIzfTAePmrXDnwo%3D&reserved=0> >> >> >> //Marcus >> >> >> >> >> _______________________________________________ >> opus mailing list >> opus at xiph.org >> https://nam01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.xiph.org%2Fmailman%2Flistinfo%2Fopus&data=02%7C01%7C%7C47f897fd8d6e42c8336c08d6b739d457%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636897856328837885&sdata=xTw1jcE0ABlREHtDX5ycQXcrYnzQijLEWJ2LZk6JPEk%3D&reserved=0 >>
Marcus Asteborg
2019-Apr-02 23:15 UTC
[opus] CMake support for Opus proposal (in addition to Autotools)
Right that I had completely missed, I have added the files and verified that it
builds with CMake from the tar on Linux (out of the git repo)
I am parsing the package_version file from the tarball if it exists so it should
maintain the version info.
//Marcus
________________________________
From: Jean-Marc Valin <jmvalin at jmvalin.ca>
Sent: Tuesday, April 2, 2019 11:38
To: Marcus Asteborg; opus at xiph.org
Subject: Re: [opus] CMake support for Opus proposal (in addition to Autotools)
Thanks, it applies now. I think you'd also want to add some (all?) of
these files to EXTRA_DIST in Makefile.am, otherwise your cmake files
won't be included in release tarballs, which are generate using "make
dist". To test, you should try running run "make dist" to
generate a
tarball yourself. From there, you try building the contents with your
cmake files and see if it works.
Cheers,
Jean-Marc
On 04/02/2019 11:26 AM, Marcus Asteborg wrote:> Hi,
>
> Thanks for the quick feedback I have changed the name to avoid conflict.
>
> Attached is the updated patch.
>
> //Marcus
> ------------------------------------------------------------------------
> *From:* Jean-Marc Valin <jmvalin at jmvalin.ca>
> *Sent:* Tuesday, April 2, 2019 00:07
> *To:* Marcus Asteborg; opus at xiph.org
> *Subject:* Re: [opus] CMake support for Opus proposal (in addition to
> Autotools)
>
> Hi Marcus,
>
> There seems to be a conflict between the autotools-created config.h.in
> and the same file added by your patch. Any way you can use use a
> different name?
>
> Cheers,
>
> Jean-Marc
>
> On 04/02/2019 01:39 AM, Marcus Asteborg wrote:
>> Hi,
>>
>>
>> Here is a proposal for adding CMake in addition of Autotools.
>>
>>
>> See the attached patch for changes or the pull request here:
>>
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884177946&sdata=Ed139jcES0woXrPabecRjGq7vGrnvpZJkRBQ8ty86Ys%3D&reserved=0
>>
<https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F100&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884187957&sdata=a50Uz9L4XicAFm82I0J1RvorD42Bg9SXxMxIGmSpJSw%3D&reserved=0>
>>
>>
>> The CMake scripts are parsing the filelist from Autotools, so only one
>> file list needs to be maintained.
>>
>>
>> With this change the checked in Visual Studio solution can be removed
>> and no longer need to be maintained and updated when Visual Studio is
>> updated.
>>
>>
>> For related discussion about CMake support see
>>
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884187957&sdata=5IvhQfm5HjZZYF9eOfapg7VH7X0AWLcXnCyYmJYG848%3D&reserved=0
>
<https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fpull%2F37&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884187957&sdata=5IvhQfm5HjZZYF9eOfapg7VH7X0AWLcXnCyYmJYG848%3D&reserved=0>
>>
>>
>> For any concerns, comments or questions regarding the change please
>> comment in the pull request, reply to this thread or send me an e-mail.
>>
>>
>> Related Issue:
>>
>>
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884187957&sdata=z2POz2d0rUDPwTSMov7BD6qQyUl25cRCBIRJpzsK8d4%3D&reserved=0
>>
<https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fxiph%2Fopus%2Fissues%2F85&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884187957&sdata=z2POz2d0rUDPwTSMov7BD6qQyUl25cRCBIRJpzsK8d4%3D&reserved=0>
>>
>>
>> //Marcus
>>
>>
>>
>>
>> _______________________________________________
>> opus mailing list
>> opus at xiph.org
>>
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.xiph.org%2Fmailman%2Flistinfo%2Fopus&data=02%7C01%7C%7C83448751302e4bd85a8908d6b79a58ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636898270884197962&sdata=szVFXlIfbQD%2FL6OMWEonuysnYQo46vSjJ%2FcIgh2ahsc%3D&reserved=0
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20190402/bb037215/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Adding-CMake-support-for-Windows-Mac-Linux-and-Andro.patch
Type: application/octet-stream
Size: 30476 bytes
Desc: 0003-Adding-CMake-support-for-Windows-Mac-Linux-and-Andro.patch
URL:
<http://lists.xiph.org/pipermail/opus/attachments/20190402/bb037215/attachment-0001.obj>