generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-05-19 20:56:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #234 from kurdybacha/cmake-tweaks

Browse Source 
Problem: cppzmq needs to be installed for pkg-config libzmq
This commit is contained in:
Simon Giesecke 2018-05-19 11:30:42 +02:00 committed by GitHub
commit d487e67249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -59,6 +59,10 @@ install(FILES ${CPPZMQ_HEADERS}
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share". # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
set(CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for cppzmqConfig.cmake") set(CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for cppzmqConfig.cmake")
configure_file(libzmq-pkg-config/FindZeroMQ.cmake
libzmq-pkg-config/FindZeroMQ.cmake
COPYONLY)
export(EXPORT ${PROJECT_NAME}-targets export(EXPORT ${PROJECT_NAME}-targets
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake") FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
configure_package_config_file(${PROJECT_NAME}Config.cmake.in configure_package_config_file(${PROJECT_NAME}Config.cmake.in

2
README.md
View File

@ -23,7 +23,7 @@ Supported platforms
- Only a subset of the platforms that are supported by libzmq itself are supported. Some features already require a compiler supporting C++11. In the future, probably all features will require C++11. To build and run the tests, cmake and googletest are required. - Only a subset of the platforms that are supported by libzmq itself are supported. Some features already require a compiler supporting C++11. In the future, probably all features will require C++11. To build and run the tests, cmake and googletest are required.
- Tested libzmq versions are - Tested libzmq versions are
- 4.2.4 (without DRAFT API) - 4.2.0 (without DRAFT API)
- 4.2.5 (with and without DRAFT API) - 4.2.5 (with and without DRAFT API)
- Platforms with full support (i.e. CI executing build and tests) - Platforms with full support (i.e. CI executing build and tests)
- Ubuntu 14.04 x64 (with gcc 4.8.4) (without DRAFT API only) - Ubuntu 14.04 x64 (with gcc 4.8.4) (without DRAFT API only)

6
ci_build.sh
View File

@ -48,10 +48,6 @@ cppzmq_build() {
fi fi
cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
cmake --build ${CPPZMQ} -- -j${JOBS} cmake --build ${CPPZMQ} -- -j${JOBS}
if [ "${BUILD_TYPE}" = "pkgconfig" ] ; then
cd ${CPPZMQ}
sudo make install
fi
popd popd
} }
@ -66,8 +62,8 @@ cppzmq_demo() {
pushd . pushd .
if [ "${BUILD_TYPE}" = "cmake" ] ; then if [ "${BUILD_TYPE}" = "cmake" ] ; then
export ZeroMQ_DIR=${LIBZMQ} export ZeroMQ_DIR=${LIBZMQ}
export cppzmq_DIR=${CPPZMQ}
fi fi
cppzmq_DIR=${CPPZMQ} \
cmake -Hdemo -Bdemo/build cmake -Hdemo -Bdemo/build
cmake --build demo/build cmake --build demo/build
cd demo/build cd demo/build