Commit c0cca118 authored by Nicolas Michon's avatar Nicolas Michon

Changes for correct installation path under Debian and derivatives

parent be35cc23
...@@ -158,8 +158,12 @@ else() ...@@ -158,8 +158,12 @@ else()
lcb_configure_options("--cc=$CC") lcb_configure_options("--cc=$CC")
endif() endif()
include(GNUInstallDirs)
lcb_cross_compilation_options( lcb_cross_compilation_options(
"--prefix=${CMAKE_INSTALL_PREFIX}" "--prefix=${CMAKE_INSTALL_PREFIX}"
"--libdir=${CMAKE_INSTALL_FULL_LIBDIR}"
"--shlibdir=${CMAKE_INSTALL_FULL_LIBDIR}"
"--arch=${FFMPEG_ARCH}" "--arch=${FFMPEG_ARCH}"
"--target-os=${FFMPEG_TARGET_OS}" "--target-os=${FFMPEG_TARGET_OS}"
) )
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# #
############################################################################ ############################################################################
lcb_git_repository("gitosis@git.linphone.org:lime.git") lcb_git_repository("https://gitlab.linphone.org/BC/public/lime.git")
lcb_git_tag_latest("master") lcb_git_tag_latest("master")
lcb_git_tag("master") lcb_git_tag("master")
lcb_external_source_paths("lime") lcb_external_source_paths("lime")
......
...@@ -168,7 +168,7 @@ else() ...@@ -168,7 +168,7 @@ else()
if(USE_TARGET) if(USE_TARGET)
lcb_cross_compilation_options( lcb_cross_compilation_options(
"--prefix=${CMAKE_INSTALL_PREFIX}" "--prefix=${CMAKE_INSTALL_PREFIX}"
"--libdir=${CMAKE_INSTALL_PREFIX}/lib" "--libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
"--target=${VPX_TARGET}" "--target=${VPX_TARGET}"
) )
else() else()
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
# #
############################################################################ ############################################################################
include(GNUInstallDirs)
include(ExternalProject) include(ExternalProject)
include(${CMAKE_CURRENT_LIST_DIR}/LinphoneOptions.cmake) include(${CMAKE_CURRENT_LIST_DIR}/LinphoneOptions.cmake)
...@@ -102,7 +103,7 @@ list(APPEND LINPHONE_BUILDER_EP_VARS ...@@ -102,7 +103,7 @@ list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING
CMAKE_MODULE_PATH:PATH CMAKE_MODULE_PATH:PATH
CMAKE_NO_BUILD_TYPE:BOOL CMAKE_NO_BUILD_TYPE:BOOL
CMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL CMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL
CMAKE_PREFIX_PATH:STRING CMAKE_PREFIX_PATH:STRING
CMAKE_STAGING_PREFIX:STRING CMAKE_STAGING_PREFIX:STRING
...@@ -121,6 +122,31 @@ list(APPEND LINPHONE_BUILDER_EP_VARS ...@@ -121,6 +122,31 @@ list(APPEND LINPHONE_BUILDER_EP_VARS
MSVC_CXX_ARCHITECTURE_ID:STRING MSVC_CXX_ARCHITECTURE_ID:STRING
MSVC_VERSION:STRING MSVC_VERSION:STRING
) )
#Inherit GnuInstallDirs variables
foreach(dir
BINDIR
SBINDIR
LIBEXECDIR
SYSCONFDIR
SHAREDSTATEDIR
LOCALSTATEDIR
RUNSTATEDIR
LIBDIR
INCLUDEDIR
OLDINCLUDEDIR
DATAROOTDIR
DATADIR
INFODIR
LOCALEDIR
MANDIR
DOCDIR
)
list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_INSTALL_${dir}:PATH
CMAKE_INSTALL_FULL_${dir}:PATH
)
endforeach()
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
list(APPEND LINPHONE_BUILDER_EP_VARS list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_SYSTEM_NAME:STRING CMAKE_SYSTEM_NAME:STRING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment