diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | project/cmake/scripts/common/prepare-env.cmake | 4 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/UseMultiArch.cmake | 44 |
3 files changed, 0 insertions, 51 deletions
diff --git a/Makefile.in b/Makefile.in index 25be962a27..1bdbec614d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -624,9 +624,6 @@ endif @for f in project/cmake/scripts/common/*.cmake; do \ install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \ done -ifeq ($(findstring linux,@host@),linux) - install -m 0644 project/cmake/scripts/linux/UseMultiArch.cmake $(DESTDIR)$(libdir)/@APP_NAME_LC@ -endif @cd $(DESTDIR)$(includedir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc uninstall: diff --git a/project/cmake/scripts/common/prepare-env.cmake b/project/cmake/scripts/common/prepare-env.cmake index 455ad512ff..a4bd9089a8 100644 --- a/project/cmake/scripts/common/prepare-env.cmake +++ b/project/cmake/scripts/common/prepare-env.cmake @@ -59,10 +59,6 @@ file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${APP_LIB_DIR}) -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - file(COPY ${APP_ROOT}/project/cmake/scripts/linux/UseMultiArch.cmake DESTINATION ${APP_LIB_DIR}) -endif() - # generate xbmc-config.cmake for backwards compatibility to xbmc configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY) diff --git a/project/cmake/scripts/linux/UseMultiArch.cmake b/project/cmake/scripts/linux/UseMultiArch.cmake deleted file mode 100644 index ce6b3e3b28..0000000000 --- a/project/cmake/scripts/linux/UseMultiArch.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# - Multiarch support in object code library directories -# -# This module sets the following variable -# CMAKE_INSTALL_LIBDIR to lib, lib64 or lib/x86_64-linux-gnu -# depending on the platform; use this path -# for platform-specific binaries. -# -# CMAKE_INSTALL_LIBDIR_NOARCH to lib or lib64 depending on the platform; -# use this path for architecture-independent -# files. -# -# Note that it will override the results of GNUInstallDirs if included after -# that module. - -# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu; -# Fedora put module files in lib64/ too, but Debian uses lib/ for that -if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" AND - "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND - NOT "${CORE_SYSTEM_NAME}" STREQUAL "android") - # Debian or Ubuntu? - if (EXISTS "/etc/debian_version") - set (_libdir_def "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - set (_libdir_noarch "lib") - else (EXISTS "/etc/debian_version") - # 64-bit system? - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - set (_libdir_noarch "lib64") - else (CMAKE_SIZEOF_VOID_P EQUAL 8) - set (_libdir_noarch "lib") - endif (CMAKE_SIZEOF_VOID_P EQUAL 8) - set (_libdir_def "${_libdir_noarch}") - endif (EXISTS "/etc/debian_version") -else () - set (_libdir_def "lib") - set (_libdir_noarch "lib") -endif () - -# let the user override if somewhere else is desirable -set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries") -set (CMAKE_INSTALL_LIBDIR_NOARCH "${_libdir_noarch}" CACHE PATH "Architecture-independent library files") -mark_as_advanced ( - CMAKE_INSTALL_LIBDIR - CMAKE_INSTALL_LIBDIR_NOARCH - ) |