Allow changing MOZILLA_NMH_DIR.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
8e4c23e271
commit
3225fe35fe
|
@ -193,7 +193,7 @@ steps:
|
||||||
- apt-get install -qy -t sid libcurlpp-dev
|
- apt-get install -qy -t sid libcurlpp-dev
|
||||||
- apt-get install -qy build-essential file
|
- apt-get install -qy build-essential file
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DWITH_DEB=YES ..
|
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DMOZILLA_NMH_DIR="lib/mozilla/native-messaging-hosts" -DWITH_DEB=YES ..
|
||||||
- make package
|
- make package
|
||||||
- cp -v remwharead_${DRONE_TAG}-0_amd64.deb ..
|
- cp -v remwharead_${DRONE_TAG}-0_amd64.deb ..
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
cmake_minimum_required (VERSION 3.2)
|
cmake_minimum_required (VERSION 3.2)
|
||||||
project(remwharead
|
project(remwharead
|
||||||
VERSION 0.2.4
|
VERSION 0.2.5
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,9 @@ cmake --build .
|
||||||
* `-DCMAKE_BUILD_TYPE=Debug` for a debug build.
|
* `-DCMAKE_BUILD_TYPE=Debug` for a debug build.
|
||||||
* `-DWITH_MAN=NO` to not compile the manpage.
|
* `-DWITH_MAN=NO` to not compile the manpage.
|
||||||
* `-DWITH_TESTS=YES` to compile the tests.
|
* `-DWITH_TESTS=YES` to compile the tests.
|
||||||
* `-DWITH_MOZILLA=YES` to install the helper script for the Mozilla extension.
|
* `-DWITH_MOZILLA=YES` to install the wrapper for the Mozilla extension.
|
||||||
|
* `-DMOZILLA_NMH_DIR` lets you set the directory for the Mazilla
|
||||||
|
extension. Complete path is `${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}`.
|
||||||
* One of:
|
* One of:
|
||||||
** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
|
** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
|
||||||
** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
|
** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
set(MOZILLA_NMH_DIR
|
set(MOZILLA_NMH_DIR
|
||||||
"${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts")
|
"${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts" CACHE STRING "")
|
||||||
set(INSTALL_MOZILLA_NMH_DIR
|
set(INSTALL_MOZILLA_NMH_DIR
|
||||||
"${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}")
|
"${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}")
|
||||||
|
|
||||||
|
@ -7,15 +7,15 @@ add_executable(${PROJECT_NAME}_wrapper ${PROJECT_NAME}_wrapper.cpp)
|
||||||
install(TARGETS ${PROJECT_NAME}_wrapper DESTINATION ${MOZILLA_NMH_DIR})
|
install(TARGETS ${PROJECT_NAME}_wrapper DESTINATION ${MOZILLA_NMH_DIR})
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json"
|
||||||
WORKING_DIRECTORY
|
WORKING_DIRECTORY
|
||||||
"${CMAKE_SOURCE_DIR}/browser-plugins/webextension/native-wrapper"
|
"${CMAKE_SOURCE_DIR}/browser-plugins/webextension/native-wrapper"
|
||||||
DEPENDS "${PROJECT_NAME}.json"
|
DEPENDS "${PROJECT_NAME}.json"
|
||||||
COMMAND "./replace_nmh_dir.sh"
|
COMMAND "./replace_nmh_dir.sh"
|
||||||
ARGS "${INSTALL_MOZILLA_NMH_DIR}"
|
ARGS "${INSTALL_MOZILLA_NMH_DIR}"
|
||||||
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json")
|
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json")
|
||||||
add_custom_target(nmh_replace ALL
|
add_custom_target(nmh_replace ALL
|
||||||
DEPENDS "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json")
|
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json")
|
||||||
install(
|
install(
|
||||||
FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json
|
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json
|
||||||
DESTINATION ${MOZILLA_NMH_DIR})
|
DESTINATION ${MOZILLA_NMH_DIR})
|
||||||
|
|
Loading…
Reference in New Issue