Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LIBEXECDIR should be set and used #208

Merged
merged 1 commit into from
Apr 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ if (OS_LINUX)
set(CMAKE_INSTALL_PREFIX "/usr")
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/libexec")
set(PROJECT_DATADIR "${DATADIR}/openbangla-keyboard")
add_definitions(-DPROJECT_DATADIR="${PROJECT_DATADIR}")
add_definitions(-DLIBEXECDIR="${LIBEXECDIR}")

include(FindPkgConfig)
find_package(PkgConfig)
Expand Down
2 changes: 1 addition & 1 deletion data/openbangla-keyboard.desktop.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=OpenBangla Keyboard
Comment=An OpenSource, Unicode compliant Bengali Input Method.
Exec=@BIN_DIR@/openbangla-gui %f
Exec=@LIBEXECDIR@/openbangla-keyboard/openbangla-gui %f
Icon=openbangla-keyboard
Type=Application
Categories=Utility;Application;
2 changes: 1 addition & 1 deletion data/openbangla.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<component>
<name>org.freedesktop.IBus.OpenBangla</name>
<description>OpenBangla Keyboard</description>
<exec>@BIN_DIR@/ibus-openbangla --ibus</exec>
<exec>@LIBEXECDIR@/ibus-engine-openbangla --ibus</exec>
<version>@PROJECT_VERSION@</version>
<author>See About Dialog</author>
<license>GPL 3</license>
Expand Down
8 changes: 4 additions & 4 deletions src/engine/ibus/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include_directories(../riti/include ../../shared ${IBUS_INCLUDE_DIRS})
add_executable(ibus-openbangla main.cpp)
target_link_libraries(ibus-openbangla riti libShared Qt5::Core ${IBUS_LIBRARIES} dl pthread)
add_executable(ibus-engine-openbangla main.cpp)
target_link_libraries(ibus-engine-openbangla riti libShared Qt5::Core ${IBUS_LIBRARIES} dl pthread)

## Configure the files
configure_file(${CMAKE_SOURCE_DIR}/data/openbangla.xml.in ${CMAKE_BINARY_DIR}/data/openbangla.xml)
Expand Down Expand Up @@ -78,5 +78,5 @@ install(FILES ${CMAKE_BINARY_DIR}/data/openbangla-keyboard.desktop
install(FILES ${CMAKE_SOURCE_DIR}/data/io.github.openbangla.keyboard.metainfo.xml
DESTINATION ${DATADIR}/metainfo)

install(TARGETS ibus-openbangla
RUNTIME DESTINATION ${BIN_DIR})
install(TARGETS ibus-engine-openbangla
RUNTIME DESTINATION ${LIBEXECDIR})
2 changes: 1 addition & 1 deletion src/engine/ibus/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ void start_setup(bool ibus) {
"GPL 3",
"See AboutBox",
"http://openbangla.github.io/",
PROJECT_DATADIR "/ibus-openbangla --ibus",
LIBEXECDIR "/ibus-engine-openbangla --ibus",
"openbangla-keyboard"
);

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ add_executable(openbangla-gui ${SRC_MAIN} ${SRC_GUI})
target_link_libraries(openbangla-gui libShared 3rdParty Qt5::Widgets Qt5::Network ${ZSTD_LIBRARIES})

install(TARGETS openbangla-gui
RUNTIME DESTINATION ${BIN_DIR})
RUNTIME DESTINATION ${LIBEXECDIR}/openbangla-keyboard)