libpolycube: provide pkg-config (#115)

Services that are not shipped with polycube (standalone services) need to know which libraries and headers files should use in the building process. This commit adds a pkg-config file for libpolycube, so services can use it for compiling. This commit also fixes some include errors to allow such standalone services to compile. Signed-off-by: Mauricio Vasquez B <mauriciovasquezbernal@gmail.com>
polycube-network · Apr 26, 2019 · 9bb2ce7 · 9bb2ce7
1 parent f2d20a7
commit 9bb2ce7
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 16 deletions.
diff --git a/src/libs/polycube/CMakeLists.txt b/src/libs/polycube/CMakeLists.txt
@@ -1,3 +1,8 @@
 add_subdirectory(src)
 
-install(DIRECTORY include/ DESTINATION include)
+configure_file(libpolycube.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpolycube.pc @ONLY)
+
+install(DIRECTORY include/ DESTINATION /usr/include)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpolycube.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/src/libs/polycube/include/polycube/common.h b/src/libs/polycube/include/polycube/common.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <spdlog/spdlog.h>
+#include "spdlog/spdlog.h"
 #include <string>
 
 namespace polycube {

diff --git a/src/libs/polycube/include/polycube/services/base_cube.h b/src/libs/polycube/include/polycube/services/base_cube.h
@@ -19,9 +19,9 @@
 #include <map>
 #include <string>
 
-#include <spdlog/sinks/rotating_file_sink.h>
-#include <spdlog/sinks/stdout_sinks.h>
-#include <spdlog/spdlog.h>
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/sinks/stdout_sinks.h"
+#include "spdlog/spdlog.h"
 
 #include "polycube/common.h"
 

diff --git a/src/libs/polycube/include/polycube/services/cube.h b/src/libs/polycube/include/polycube/services/cube.h
@@ -19,13 +19,6 @@
 #include <map>
 #include <string>
 
-#include <spdlog/sinks/rotating_file_sink.h>
-#include <spdlog/sinks/stdout_sinks.h>
-#include <spdlog/spdlog.h>
-
-#include "polycube/common.h"
-
-#include "polycube/services/cube_factory.h"
 #include "polycube/services/port.h"
 #include "polycube/services/utils.h"
 

diff --git a/src/libs/polycube/libpolycube.pc.in b/src/libs/polycube/libpolycube.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/lib
+includedir=/usr/include
+
+Name: libpolycube
+Version: @REVISION@
+Description: Polycube library
+Requires:
+Requires.private: libtins
+Libs: -L${libdir} -lpolycube -luuid -ltins
+Cflags: -I${includedir} -I${includedir}/polycube
diff --git a/src/libs/spdlog/CMakeLists.txt b/src/libs/spdlog/CMakeLists.txt
@@ -1 +1 @@
-install(DIRECTORY spdlog DESTINATION include/polycube)
+install(DIRECTORY spdlog DESTINATION /usr/include/polycube)
diff --git a/src/services/CMakeLists.txt b/src/services/CMakeLists.txt
@@ -1,6 +1,9 @@
 include_directories(${CMAKE_SOURCE_DIR}/src/libs/polycube/include)
 include_directories(${CMAKE_SOURCE_DIR}/src/libs/spdlog)
 
+set(POLYCUBE_STANDALONE_SERVICE false)
+set(POLYCUBE_LIBRARIES polycube uuid tins)
+
 set(LOAD_SERVICES "" PARENT_SCOPE)
 
 macro(add_service servicename servicefolder)

diff --git a/src/services/pcn-helloworld/src/CMakeLists.txt b/src/services/pcn-helloworld/src/CMakeLists.txt
@@ -8,6 +8,12 @@ include_directories(serializer)
 include_directories(interface)
 include_directories(default-src)
 
+if (POLYCUBE_STANDALONE_SERVICE)
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(POLYCUBE libpolycube)
+  include_directories(${POLYCUBE_INCLUDE_DIRS})
+endif(POLYCUBE_STANDALONE_SERVICE)
+
 # Needed to load files as variables
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -26,9 +32,7 @@ load_file_as_variable(pcn-helloworld Helloworld_dp_egress.c helloworld_code_egre
 # load datamodel in a variable
 load_file_as_variable(pcn-helloworld ../datamodel/helloworld.yang helloworld_datamodel)
 
-target_link_libraries(pcn-helloworld
-  polycube
-  uuid)
+target_link_libraries(pcn-helloworld ${POLYCUBE_LIBRARIES})
 
 # Specify shared library install directory