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: > nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r/AsFXvOjyWu44=&reserved=0 > <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r/AsFXvOjyWu44=&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 > nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds+nlf9Qc=&reserved=0 <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds+nlf9Qc=&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: > > nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=MUh7c1xua91+vn8M33fbsTKS8/ZeyZV02BorkANy6h4=&reserved=0 > <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328837885&sdata=rQA6M3kf87Zd+c3IBVExdUWj8zKYMIzfTAePmrXDnwo=&reserved=0> > > > //Marcus > > > > > _______________________________________________ > opus mailing list > opus at xiph.org > nam01.safelinks.protection.outlook.com/?url=http://lists.xiph.org/mailman/listinfo/opus&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328837885&sdata=xTw1jcE0ABlREHtDX5ycQXcrYnzQijLEWJ2LZk6JPEk=&reserved=0 >-------------- next part -------------- An HTML attachment was scrubbed... URL: <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: <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: >> nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r/AsFXvOjyWu44=&reserved=0 >> <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=ulSL9eGKj8cVt6VPufmkod061Ii56r/AsFXvOjyWu44=&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 >> nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds+nlf9Qc=&reserved=0 > <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=t1IJUHKLyyDpGWzyi8A6dozfmFDZalgHs8Ds+nlf9Qc=&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: >> >> nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328827874&sdata=MUh7c1xua91+vn8M33fbsTKS8/ZeyZV02BorkANy6h4=&reserved=0 >> <nam01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328837885&sdata=rQA6M3kf87Zd+c3IBVExdUWj8zKYMIzfTAePmrXDnwo=&reserved=0> >> >> >> //Marcus >> >> >> >> >> _______________________________________________ >> opus mailing list >> opus at xiph.org >> nam01.safelinks.protection.outlook.com/?url=http://lists.xiph.org/mailman/listinfo/opus&data=02|01||47f897fd8d6e42c8336c08d6b739d457|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636897856328837885&sdata=xTw1jcE0ABlREHtDX5ycQXcrYnzQijLEWJ2LZk6JPEk=&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: >> eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884177946&sdata=Ed139jcES0woXrPabecRjGq7vGrnvpZJkRBQ8ty86Ys=&reserved=0 >> <eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/100&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884187957&sdata=a50Uz9L4XicAFm82I0J1RvorD42Bg9SXxMxIGmSpJSw=&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 >> eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884187957&sdata=5IvhQfm5HjZZYF9eOfapg7VH7X0AWLcXnCyYmJYG848=&reserved=0 > <eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/pull/37&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884187957&sdata=5IvhQfm5HjZZYF9eOfapg7VH7X0AWLcXnCyYmJYG848=&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: >> >> eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884187957&sdata=z2POz2d0rUDPwTSMov7BD6qQyUl25cRCBIRJpzsK8d4=&reserved=0 >> <eur01.safelinks.protection.outlook.com/?url=https://github.com/xiph/opus/issues/85&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884187957&sdata=z2POz2d0rUDPwTSMov7BD6qQyUl25cRCBIRJpzsK8d4=&reserved=0> >> >> >> //Marcus >> >> >> >> >> _______________________________________________ >> opus mailing list >> opus at xiph.org >> eur01.safelinks.protection.outlook.com/?url=http://lists.xiph.org/mailman/listinfo/opus&data=02|01||83448751302e4bd85a8908d6b79a58ab|84df9e7fe9f640afb435aaaaaaaaaaaa|1|0|636898270884197962&sdata=szVFXlIfbQD/L6OMWEonuysnYQo46vSjJ/cIgh2ahsc=&reserved=0 >>-------------- next part -------------- An HTML attachment was scrubbed... URL: <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: <lists.xiph.org/pipermail/opus/attachments/20190402/bb037215/attachment-0001.obj>