Skip to content

used for simulating "make dist" build target behavior and some linking #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Conversation

ghost
Copy link

@ghost ghost commented Jun 25, 2012

Just what I am using to build official dist tarballs. I also added extra library linkage for the demos since the stand-alone cmake builds would not work in (debian) chroot package builders otherwise...

@wernerd
Copy link
Owner

wernerd commented Jun 26, 2012

David,

thanks, looks good to me. I'm just working on a new release
(2.3.0) and I will implement the changes in that release.

Regards,
Werner

Am 25.06.2012 21:01, schrieb David Sugar:

Just what I am using to build official dist tarballs. I also added extra library linkage for the demos since the stand-alone cmake builds would not work in (debian) chroot package builders otherwise...

You can merge this Pull Request by running:

git pull https://github.com/dyfet/ZRTPCPP master

Or you can view, comment on it, or merge it online at:

#2

-- Commit Summary --

  • revised make for self contained builds and dist
  • versions must match

-- File Changes --

M CMakeLists.txt (22)
M demo/CMakeLists.txt (4)
M directive (2)

-- Patch Links --

https://github.com/wernerd/ZRTPCPP/pull/2.patch
https://github.com/wernerd/ZRTPCPP/pull/2.diff


Reply to this email directly or view it on GitHub:
#2


Werner Dittmann [email protected]
Tel +49 176 993 462 95
PGP key: 82EF5E8B

@wernerd
Copy link
Owner

wernerd commented Jun 26, 2012

David,

the changes you made to the CMakeLists.txt in the demo directory
don't work in my environment. I'm building ZRTP standalone and
not as part of a larger project. Thus the "ccrtp" and "commoncpp"
are not defined and are also not required.

Ween building libzrtpcpp with ccRTP support I link in ccrtp which
in turn links to ucommon and commoncpp. This is covered in the top
CMakeLists.txt inside the 'if(enable_ccrtp)' part.

Regards,
Werner

Am 25.06.2012 21:01, schrieb David Sugar:

Just what I am using to build official dist tarballs. I also added extra library linkage for the demos since the stand-alone cmake builds would not work in (debian) chroot package builders otherwise...

You can merge this Pull Request by running:

git pull https://github.com/dyfet/ZRTPCPP master

Or you can view, comment on it, or merge it online at:

#2

-- Commit Summary --

  • revised make for self contained builds and dist
  • versions must match

-- File Changes --

M CMakeLists.txt (22)
M demo/CMakeLists.txt (4)
M directive (2)

-- Patch Links --

https://github.com/wernerd/ZRTPCPP/pull/2.patch
https://github.com/wernerd/ZRTPCPP/pull/2.diff


Reply to this email directly or view it on GitHub:
#2


Werner Dittmann [email protected]
Tel +49 176 993 462 95
PGP key: 82EF5E8B

@ghost
Copy link
Author

ghost commented Jun 28, 2012

I had trouble linking it completely stand-alone without those changes...Odd....

David Sugar added 11 commits August 1, 2012 10:24
Changed pieced together sources to use relative paths since the
libzrtpcpp package might be built on a master project tree.

Fixes for mingw builds.  In particular we have to check for GCC
before checking for cygwin/win32, otherwise we get invalid
dll modes when we should not, particularly for static builds.  This
probably is also related to UCOMMON_STATIC/RUNTIME supression of
__EXPORT headers elsewhere.

Added back ccrtp flags and chain loading of local config option.
This was needed for static mingw builds since we need the correct
state of UCOMMON_STATIC and UCOMMON_RUNTIME flags, otherwise
mingw static builds still try to add dll interfaces.

This is a merge set between Wernerd & myself.  There may be other
things still broken.  I have simply verified in my build env's.

Conflicts:
    CMakeLists.txt
    zrtp/libzrtpcpp/ZrtpCallback.h
    zrtp/libzrtpcpp/ZrtpPacketBase.h
Computing of soversion from single setting...
Other change invalid for this branch

Conflicts:
    CMakeLists.txt
    zrtp/libzrtpcpp/ZIDRecordFile.h
automatic cpack versioning
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant