From 884e6f107b6ed5c122b2b2a2f30c55fa3ffcee25 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 19 May 2010 06:11:49 +0400 Subject: [PATCH 2/9] Make plugin directory customizable --- CMakeLists.txt | 1 + plugin-dir/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d7cffb..f615695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix") SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?") SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?") SET(COMPILE_PLUGIN FALSE CACHE BOOL "Compile the Firefox Plugin?") +SET(PLUGIN_DIRECTORY "/usr/lib/mozilla/plugins" CACHE STRING "Directory to install Firefox plugin to") SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf) diff --git a/plugin-dir/CMakeLists.txt b/plugin-dir/CMakeLists.txt index 5c5c495..35f77ed 100644 --- a/plugin-dir/CMakeLists.txt +++ b/plugin-dir/CMakeLists.txt @@ -44,6 +44,6 @@ ADD_LIBRARY(lightsparkplugin SHARED ${LIBSPARK_SOURCES} np_entry.cpp npn_gate.cp #UNIX? IF(UNIX) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblightsparkplugin.so DESTINATION /usr/lib/mozilla/plugins) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblightsparkplugin.so DESTINATION ${PLUGIN_DIRECTORY}) ENDIF(UNIX) -- 1.7.1