# HG changeset patch # User František Kučera # Date 1575387002 -3600 # Node ID bcff4ebca71da0285d5b81020032746f63e1023a # Parent e8889e9b67863d889732f41e69b6f8b6a050620c rename and make shared library: relpipe-lib-protocol.cpp → relpipe-lib-common.cpp diff -r e8889e9b6786 -r bcff4ebca71d nbproject/configurations.xml --- a/nbproject/configurations.xml Wed Oct 30 16:47:42 2019 +0100 +++ b/nbproject/configurations.xml Tue Dec 03 16:30:02 2019 +0100 @@ -78,7 +78,7 @@ build/Debug/src/welcome - ../relpipe-lib-protocol.cpp/include + ../relpipe-lib-common.cpp/include build/Debug/src diff -r e8889e9b6786 -r bcff4ebca71d src/CMakeLists.txt --- a/src/CMakeLists.txt Wed Oct 30 16:47:42 2019 +0100 +++ b/src/CMakeLists.txt Tue Dec 03 16:30:02 2019 +0100 @@ -20,7 +20,7 @@ # Relpipe libraries: INCLUDE(FindPkgConfig) -pkg_check_modules (RELPIPE_LIBS relpipe-lib-protocol.cpp) +pkg_check_modules (RELPIPE_LIBS relpipe-lib-common.cpp) include_directories(${RELPIPE_LIBS_INCLUDE_DIRS}) link_directories(${RELPIPE_LIBS_LIBRARY_DIRS}) @@ -37,6 +37,9 @@ Factory.cpp ) +# Link libraries: +target_link_libraries(${LIBRARY_FILE} ${RELPIPE_LIBS_LIBRARIES}) + install(TARGETS ${LIBRARY_FILE} DESTINATION lib/relpipe) # TODO: add version and symlink install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CODE}.cpp.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/) install(DIRECTORY ../include/ DESTINATION include) diff -r e8889e9b6786 -r bcff4ebca71d src/pkg-config.cpp.pc.in --- a/src/pkg-config.cpp.pc.in Wed Oct 30 16:47:42 2019 +0100 +++ b/src/pkg-config.cpp.pc.in Tue Dec 03 16:30:02 2019 +0100 @@ -6,5 +6,7 @@ Description: @PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ +Requires: relpipe-lib-common.cpp = @PROJECT_VERSION@ + Libs: -L${libdir} -l@LIBRARY_FILE@ Cflags: -I${includedir}