Permalink
Browse files

Add nyx_cmd_module_dir variable to nyx.pc

Adds a pkgconfig variable for the root of the directory tree into which
modules for nyx-cmd are installed.

Open-webOS-DCO-1.0-Signed-off-by: Keith Derrick <keith.derrick@palm.com>

Change-Id: I35edfc990bb2e695be629be8650552595e232229
  • Loading branch information...
Keith Derrick
Keith Derrick committed Nov 28, 2012
1 parent 14ae563 commit ff349342b3f387ccd4a8937f9ad9a217672d98f2
Showing with 6 additions and 3 deletions.
  1. +5 −3 CMakeLists.txt
  2. +1 −0 files/pkgconfig/nyx.pc.in
View
@@ -25,14 +25,16 @@ cmake_minimum_required(VERSION 2.8.7)
project(nyx)
set(NYX_API_VERSION_MAJOR 3)
-set(NYX_API_VERSION_MINOR 0)
+set(NYX_API_VERSION_MINOR 1)
include(webOS/webOS)
webos_modules_init(1 0 0 QUALIFIER RC4)
webos_component(${NYX_API_VERSION_MAJOR} ${NYX_API_VERSION_MINOR} 0 QUALIFIER RC1)
-set(NYX_MODULE_DIR ${WEBOS_INSTALL_LIBDIR}/nyx/modules CACHE PATH "Nyx modules directory path")
-set(NYX_MODULE_MOCK_DIR ${WEBOS_INSTALL_LIBDIR}/nyx/modules.mock CACHE PATH "Nyx mock modules directory path")
+set(NYX_LIB_ROOT ${WEBOS_INSTALL_LIBDIR}/nyx CACHE PATH "Nyx internal executables install root path")
+set(NYX_CMD_MODULE_DIR ${NYX_LIB_ROOT}/nyxcmd CACHE PATH "nyx-cmd modules directory path")
+set(NYX_MODULE_DIR ${NYX_LIB_ROOT}/modules CACHE PATH "Nyx modules directory path")
+set(NYX_MODULE_MOCK_DIR ${NYX_LIB_ROOT}/modules.mock CACHE PATH "Nyx mock modules directory path")
set(NYX_MODULE_PREFIX nyx)
set(NYX_MODULE_SUFFIX .module)
@@ -18,6 +18,7 @@
libdir=@WEBOS_INSTALL_LIBDIR@
includedir=@WEBOS_INSTALL_INCLUDEDIR@
+nyx_cmd_module_dir=@NYX_CMD_MODULE_DIR@
nyx_module_dir=@NYX_MODULE_DIR@
nyx_module_mock_dir=@NYX_MODULE_MOCK_DIR@
nyx_module_prefix=@NYX_MODULE_PREFIX@

0 comments on commit ff34934

Please sign in to comment.