File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -59,6 +59,10 @@ install(FILES ${CPPZMQ_HEADERS}
59
59
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
60
60
set (CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME} " CACHE STRING "install path for cppzmqConfig.cmake" )
61
61
62
+ configure_file (libzmq-pkg-config/FindZeroMQ.cmake
63
+ libzmq-pkg-config/FindZeroMQ.cmake
64
+ COPYONLY )
65
+
62
66
export (EXPORT ${PROJECT_NAME} -targets
63
67
FILE "${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} Targets.cmake" )
64
68
configure_package_config_file (${PROJECT_NAME} Config.cmake.in
Original file line number Diff line number Diff line change @@ -48,10 +48,6 @@ cppzmq_build() {
48
48
fi
49
49
cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
50
50
cmake --build ${CPPZMQ} -- -j${JOBS}
51
- if [ " ${BUILD_TYPE} " = " pkgconfig" ] ; then
52
- cd ${CPPZMQ}
53
- sudo make install
54
- fi
55
51
popd
56
52
}
57
53
@@ -66,8 +62,8 @@ cppzmq_demo() {
66
62
pushd .
67
63
if [ " ${BUILD_TYPE} " = " cmake" ] ; then
68
64
export ZeroMQ_DIR=${LIBZMQ}
69
- export cppzmq_DIR=${CPPZMQ}
70
65
fi
66
+ cppzmq_DIR=${CPPZMQ} \
71
67
cmake -Hdemo -Bdemo/build
72
68
cmake --build demo/build
73
69
cd demo/build
You can’t perform that action at this time.
0 commit comments