Do not rely on codegenerator for setting dependencies on pkgconfig file

Change-Id: Idaa59140bef5a2d2eb47e00b316da7b7c9d47fab
Kurento · Oct 1, 2014 · d9b807f · d9b807f
1 parent 6180b6f
commit d9b807f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,9 @@ find_package(PkgConfig)
 
 set (GST_REQUIRED 1.4.0)
 set (GLIB_REQUIRED 2.38)
+set (JSON_RPC_REQUIRED 0.1.0)
+set (SIGCPP_REQUIRED 2.0.10)
+set (GLIBMM_REQUIRED 2.37)
 
 find_package(Boost REQUIRED COMPONENTS filesystem system)
 
@@ -31,9 +34,9 @@ pkg_check_modules(GSTREAMER_CHECK REQUIRED gstreamer-check-1.0>=${GST_REQUIRED})
 pkg_check_modules(GSTREAMER_SDP REQUIRED gstreamer-sdp-1.0>=${GST_REQUIRED})
 pkg_check_modules(GSTREAMER_PBUTILS REQUIRED gstreamer-pbutils-1.0>=${GST_REQUIRED})
 
-find_package(KmsJsonRpc 0.1.0 REQUIRED)
-pkg_check_modules(SIGCPP REQUIRED sigc++-2.0>=2.0.10)
-pkg_check_modules(GLIBMM REQUIRED glibmm-2.4>=2.37)
+find_package(KmsJsonRpc ${JSON_RPC_REQUIRED} REQUIRED)
+pkg_check_modules(SIGCPP REQUIRED sigc++-2.0>=${SIGCPP_REQUIRED})
+pkg_check_modules(GLIBMM REQUIRED glibmm-2.4>=${GLIBMM_REQUIRED})
 
 find_package(LibVpx REQUIRED)
 

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -67,4 +67,6 @@ generate_code (
       ${SIGCPP_LIBRARIES}
   SERVER_STUB_DESTINATION
       ${CMAKE_CURRENT_SOURCE_DIR}/implementation/objects
+  SERVER_IMPL_LIB_PKGCONFIG_EXTRA_REQUIRES
+      "gstreamer-1.0 >= ${GST_REQUIRED} gstreamer-sdp-1.0 >= ${GST_REQUIRED} libjsonrpc >= ${JSON_RPC_REQUIRED} sigc++-2.0 >= ${SIGCPP_REQUIRED} glibmm-2.4 >= ${GLIBMM_REQUIRED}"
 )