Skip to content
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

Build system fixes for develop branch #102

Merged
merged 8 commits into from
Apr 3, 2015
Merged

Build system fixes for develop branch #102

merged 8 commits into from
Apr 3, 2015

Conversation

mgorny
Copy link
Contributor

@mgorny mgorny commented Mar 31, 2015

As requested in #100, rebased for develop branch.

Support appending ABI-specific suffix to libdir as needed for install on
multilib systems. This is done via LIB_SUFFIX variable that is used
in some other CMake projects.
Fix the stubgen output filename and #include to use
the 'abstractstubserver.h' as defined as OUTPUT and listed in README.
Remove duplicate HTTP_SERVER and HTTP_CLIENT conditions inside examples
since all examples are conditional to them.
Include examples/CMakeLists.txt independently of COMPILE_EXAMPLES
conditional, use it to restrict building programs inside that file. This
makes sure that the stub building rules are available for tests even
when building examples is disabled.

Fixes: #101
Introduce BUILD_STATIC_LIBS to control building static libraries.

Fixes: #99
Use correct ${CMAKE_BINARY_DIR}/gen paths for dependencies on generated
stubs. This ensures that CMake correctly regenerates them only if
jsonrpcstub or the spec file changes.
@mgorny
Copy link
Contributor Author

mgorny commented Apr 2, 2015

Ok, changed the library patch to just introduce BUILD_STATIC_LIBS control variable.

@cinemast
Copy link
Owner

cinemast commented Apr 3, 2015

Thank you very much! 👍

cinemast added a commit that referenced this pull request Apr 3, 2015
Build system fixes for develop branch
@cinemast cinemast merged commit 64554cf into cinemast:develop Apr 3, 2015
@mgorny mgorny deleted the develop-fixes branch April 3, 2015 20:27
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.

None yet

2 participants