From 7d86ae545370c52b8171b3406039c30e52372c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Tue, 24 Sep 2013 15:24:58 +0200 Subject: [PATCH] Revert " Add special variable for MultiArch-unaware components" This reverts commit 1cadc5af6d1074b8cd053db464924fb08e5a0ad7. --- cmake/Modules/UseMultiArch.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/UseMultiArch.cmake b/cmake/Modules/UseMultiArch.cmake index dfba736e2..f1a5d665a 100644 --- a/cmake/Modules/UseMultiArch.cmake +++ b/cmake/Modules/UseMultiArch.cmake @@ -8,11 +8,8 @@ # Note that it will override the results of GNUInstallDirs if included after # that module. -# default if we need to put something in the library directory for a -# component that is *not* multiarch-aware -set (LIBDIR_MULTIARCH_UNAWARE "lib") - -# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu +# 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") # Debian or Ubuntu? if (EXISTS "/etc/debian_version") @@ -22,7 +19,6 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") # 64-bit system? if (CMAKE_SIZEOF_VOID_P EQUAL 8) set (_libdir_def "lib64") - set (LIBDIR_MULTIARCH_UNAWARE "${_libdir_def}") else (CMAKE_SIZEOF_VOID_P EQUAL 8) set (_libdir_def "lib") endif (CMAKE_SIZEOF_VOID_P EQUAL 8)