From ecbcf10ddf7a8a5716861d87808574f0c5249398 Mon Sep 17 00:00:00 2001 From: Pawel Kurdybacha Date: Fri, 18 May 2018 22:20:45 +0100 Subject: [PATCH 1/2] Problem: cppzmq needs to be installed for pkg-config libzmq Solution: Make sure that FinZeroMQ.cmake is present in cppzmq's build (binary) directory --- CMakeLists.txt | 4 ++++ ci_build.sh | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b14b36..8ac7b34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,10 @@ install(FILES ${CPPZMQ_HEADERS} # 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") +configure_file(libzmq-pkg-config/FindZeroMQ.cmake + libzmq-pkg-config/FindZeroMQ.cmake + COPYONLY) + export(EXPORT ${PROJECT_NAME}-targets FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake") configure_package_config_file(${PROJECT_NAME}Config.cmake.in diff --git a/ci_build.sh b/ci_build.sh index 8a3aba9..74db483 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -48,10 +48,6 @@ cppzmq_build() { fi cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS} cmake --build ${CPPZMQ} -- -j${JOBS} - if [ "${BUILD_TYPE}" = "pkgconfig" ] ; then - cd ${CPPZMQ} - sudo make install - fi popd } @@ -66,8 +62,8 @@ cppzmq_demo() { pushd . if [ "${BUILD_TYPE}" = "cmake" ] ; then export ZeroMQ_DIR=${LIBZMQ} - export cppzmq_DIR=${CPPZMQ} fi + cppzmq_DIR=${CPPZMQ} \ cmake -Hdemo -Bdemo/build cmake --build demo/build cd demo/build From 869ebe111a00651aec5ed39003bca00fbe30d3d6 Mon Sep 17 00:00:00 2001 From: Pawel Kurdybacha Date: Fri, 18 May 2018 22:42:13 +0100 Subject: [PATCH 2/2] Problem: wrong version of libzmq in README. Solution: Change it to CI supported 4.2.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0ddea0..b20713d 100644 --- a/README.md +++ b/README.md @@ -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. - Tested libzmq versions are - - 4.2.4 (without DRAFT API) + - 4.2.0 (without DRAFT API) - 4.2.5 (with and without DRAFT API) - Platforms with full support (i.e. CI executing build and tests) - Ubuntu 14.04 x64 (with gcc 4.8.4) (without DRAFT API only)