CMake added

[offa]

This PR addes cmake as a second build tool.

Available:

• Building of library and apps
• Installation using make install
• Travis CI (Matrix using both)
• Generation of embedded content
• Testing compiler for emplace()
• Optional building / running of tests using gtest / gmock (default: OFF)
• Configure file - Config.h (based on a custom template in cmake/)

Not (yet) available:

• Building tests on CI using cmake

Since google has merged gtest / gmock into one project - gmock depends on gtest though - i'm not sure how to handle this case on CI. It seems gmock requires gtest but doesn't ship it anymore in one bundle (?).

At the moment cmake will look for both if tests are enabled, otherwise there's no dependency on gtest / gmock if disabled.

What's different to autoconf:

The cmake builds will use it's own Config.h (cmake directory); it has only a definition for HAVE_UNORDERED_MAP_EMPLACE, since i didn't see any usage of all the other flags. However, adding more options is simple enough.

[mattgodbolt]

Thanks for this great contribution. I will take a proper look over the next
day or two!
On Sat, Oct 17, 2015 at 10:47 AM, offa notifications@github.com wrote:

This PR addes cmake as a second build tool.
Available:

• Building of library and apps
• Installation using make install
• Travis CI (Matrix using both)
• Generation of embedded content
• Testing compiler for emplace()
• Optional building / running of tests using gtest / gmock (default:
  OFF)
• Configure file - Config.h (based on a custom template in cmake/)

Not (yet) available:

• Building tests on CI using cmake

Since google has merged gtest / gmock into one project - gmock depends on
gtest though - i'm not sure how to handle this case on CI. It seems gmock
requires gtest but doesn't ship it anymore in one bundle (?).

At the moment cmake will look for both if tests are enabled, otherwise
there's no dependency on gtest / gmock if disabled.
What's different to autoconf:

The cmake builds will use it's own Config.h (cmake directory); it has
only a definition for HAVE_UNORDERED_MAP_EMPLACE, since i didn't see any

usage of all the other flags. However, adding more options is simple enough.

You can view, comment on, or merge this pull request online at:

#14
Commit Summary

• CMakeFiles added.
• Some Improvements.
• Dependencies fixed.
• Call fix.
• Configure file.
• Map test integrated.
• Embedded library.
• Static lib removed.
• Linking generated sources (WIP).
• Embedded content linkage fixed.
• Wall added.
• Merge branch 'master' into cmake
• Merge branch 'master' into cmake
• Version set.
• Install target added.
• Travis builds using cmake added and cmake set to 2.8.x, since
  there's no v3.x availalbe on travis yet.
• Apps added.
• Tests added.

File Changes

• M .gitignore
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-0 (1)
• M .travis.yml
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-1 (11)
• A CMakeLists.txt
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-2 (41)
• A cmake/CompilerCheck.cmake
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-3 (25)
• A cmake/Config.h.in
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-4 (7)
• A cmake/EmbeddedContent.cmake
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-5 (14)
• A cmake/Findgmock.cmake
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-6 (23)
• A cmake/Findgtest.cmake
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-7 (23)
• A src/app/c/CMakeLists.txt
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-8 (13)
• A src/main/c/CMakeLists.txt
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-9 (35)
• A src/test/c/CMakeLists.txt
  https://github.com/mattgodbolt/seasocks/pull/14/files#diff-10 (23)

Patch Links:

• https://github.com/mattgodbolt/seasocks/pull/14.patch
• https://github.com/mattgodbolt/seasocks/pull/14.diff

—
Reply to this email directly or view it on GitHub
#14.

[offa]

Great! 👍

With cmake i was able to cross-compile for an embedded Arm - seasocks works like a charm!

[mattgodbolt]

This is great stuff; thanks! I'll merge in and once we get a decent way of pointing at gmock I'll probably deprecate the old configure-based stuff in favour of CMake.

[mattgodbolt]

I've updated the main build to work with Catch.hpp instead of
google{test,mock}. I also hacked about a bit and added most of the things I
thought the CMake approach was missing; can you check it still works for
you here?

Thanks!

On Sun, Oct 18, 2015 at 7:21 AM, offa notifications@github.com wrote:

Great! [image: 👍]

With cmake i was able to cross-compile for an embedded Arm - seasocks
works like a charm!

—
Reply to this email directly or view it on GitHub
#14 (comment).

Matt

[offa]

Everything fine so far.

[offa]

Just one thing: It's a bit hard to figure out, where a build failure comes from currently.

[offa]

I have addressed this in #15.

[mattgodbolt]

Thanks! Merged :)

[offa]

@mattgodbolt Can we add an option for Tests, so they can (optionally) be turned off?

[mattgodbolt]

Certainly! Feel free to send a PR, else I'll try and get to it later this
week.

On Wed, Oct 21, 2015 at 1:05 PM offa notifications@github.com wrote:

@mattgodbolt https://github.com/mattgodbolt Can we add an option for
Tests, so they can (optionally) be turned off?

—
Reply to this email directly or view it on GitHub
#14 (comment).

[offa]

Done: #20