Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
9d06e29c
Commit
9d06e29c
authored
Dec 14, 2018
by
Luca Boccassi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: duplicated pkg-config template
Solution: use the same for both autotools and cmake
parent
ed8ed727
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
13 deletions
+6
-13
CMakeLists.txt
CMakeLists.txt
+6
-1
Makefile.am
Makefile.am
+0
-1
libzmq.pc.cmake.in
src/libzmq.pc.cmake.in
+0
-11
No files found.
CMakeLists.txt
View file @
9d06e29c
...
...
@@ -918,7 +918,12 @@ file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/src/platform.hpp)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/builds/cmake/platform.hpp.in
${
CMAKE_CURRENT_BINARY_DIR
}
/platform.hpp
)
list
(
APPEND sources
${
CMAKE_CURRENT_BINARY_DIR
}
/platform.hpp
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/libzmq.pc.cmake.in
${
CMAKE_CURRENT_BINARY_DIR
}
/libzmq.pc @ONLY
)
set
(
prefix
${
CMAKE_INSTALL_PREFIX
}
)
set
(
exec_prefix
${
prefix
}
)
set
(
libdir
${
prefix
}
/lib
)
set
(
includedir
${
prefix
}
/include
)
set
(
VERSION
${
ZMQ_VERSION_MAJOR
}
.
${
ZMQ_VERSION_MINOR
}
.
${
ZMQ_VERSION_PATCH
}
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/libzmq.pc.in
${
CMAKE_CURRENT_BINARY_DIR
}
/libzmq.pc @ONLY
)
set
(
zmq-pkgconfig
${
CMAKE_CURRENT_BINARY_DIR
}
/libzmq.pc
)
if
(
NOT ZMQ_BUILD_FRAMEWORK
)
...
...
Makefile.am
View file @
9d06e29c
...
...
@@ -1046,7 +1046,6 @@ EXTRA_DIST = \
CMakeLists.txt
\
autogen.sh
\
version.sh
\
src/libzmq.pc.cmake.in
\
ci_build.sh
\
src/libzmq.vers
\
src/version.rc.in
\
...
...
src/libzmq.pc.cmake.in
deleted
100644 → 0
View file @
ed8ed727
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
Name: libzmq
Description: 0MQ c++ library
Version: @ZMQ_VERSION_MAJOR@.@ZMQ_VERSION_MINOR@.@ZMQ_VERSION_PATCH@
Libs: -L${libdir} -lzmq
Libs.private: -lstdc++ @pkg_config_libs_private@
Cflags: -I${includedir} @pkg_config_defines@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment