Skip to content

build: fix Linux installation paths (#253) #262

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.

Sign up for GitHub

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

Open
profGenki88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: fix Linux installation paths (#253) #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ message(STATUS "CMAKE_INSTALL_LIBDIR: '${CMAKE_INSTALL_LIBDIR}'")

if(UNIX)
if(STANDALONE)
set(INSTALL_DEST_LIB CANdevStudio)
set(INSTALL_DEST_BIN CANdevStudio)
set(INSTALL_DEST_PLUG CANdevStudio/canbus)
set(INSTALL_DEST_LIB lib/CANdevStudio)
set(INSTALL_DEST_BIN lib/CANdevStudio)
set(INSTALL_DEST_PLUG lib/CANdevStudio/canbus)
else()
set(INSTALL_DEST_LIB ${CMAKE_INSTALL_LIBDIR}/CANdevStudio)
set(INSTALL_DEST_BIN bin)
Expand Down Expand Up @@ -157,15 +157,9 @@ if(STANDALONE)
libQt5QmlModels.so.${Qt5Core_VERSION}
libQt5Quick.so.${Qt5Core_VERSION}
libQt5QuickWidgets.so.${Qt5Core_VERSION}
libicudata.so.56
libicudata.so.56.1
libicui18n.so.56
libicui18n.so.56.1
libicuuc.so.56
libicuuc.so.56.1
)

install(PROGRAMS files/CANdevStudio.sh DESTINATION ${INSTALL_DEST_BIN})
install(PROGRAMS files/CANdevStudio.sh DESTINATION bin RENAME CANdevStudio)
install(PROGRAMS /usr/lib/x86_64-linux-gnu/libxcb-xinerama.so.0.0.0 DESTINATION ${INSTALL_DEST_BIN})
install(PROGRAMS /usr/lib/x86_64-linux-gnu/libxcb-xinerama.so.0 DESTINATION ${INSTALL_DEST_BIN})
else()
Expand All @@ -191,6 +185,15 @@ if(STANDALONE)
set(SYS_LIBS_ABS ${SYS_LIBS_ABS} ${QtPath}/${SYS_LIB})
endforeach()

file(GLOB ICU_LIBS
"${QtPath}/libicudata.so*"
"${QtPath}/libicui18n.so*"
"${QtPath}/libicuuc.so*"
)
if(ICU_LIBS)
set(SYS_LIBS_ABS ${SYS_LIBS_ABS} ${ICU_LIBS})
endif()

install(PROGRAMS ${SYS_LIBS_ABS}
DESTINATION ${INSTALL_DEST_LIB}
)
Expand Down
4 changes: 4 additions & 0 deletions files/CANdevStudio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ tmp="${dirname#?}"
if [ "${dirname%$tmp}" != "/" ]; then
dirname=$PWD/$dirname
fi

# Support standard Linux installation path
[ -f "$dirname/../lib/CANdevStudio/$appname" ] && dirname="$dirname/../lib/CANdevStudio"

LD_LIBRARY_PATH=$dirname
export LD_LIBRARY_PATH
$dirname/$appname "$@"
Loading