OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert " Add special variable for MultiArch-unaware components"

Browse Source 
This reverts commit 1cadc5af6d.
This commit is contained in:
Bård Skaflestad 2013-09-24 15:24:58 +02:00
parent 9f411d6179
commit 7d86ae5453
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/UseMultiArch.cmake
View File

@ -8,11 +8,8 @@
# Note that it will override the results of GNUInstallDirs if included after # Note that it will override the results of GNUInstallDirs if included after
# that module. # that module.
# default if we need to put something in the library directory for a # Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu;
# component that is *not* multiarch-aware # Fedora put module files in lib64/ too, but Debian uses lib/ for that
set (LIBDIR_MULTIARCH_UNAWARE "lib")
# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# Debian or Ubuntu? # Debian or Ubuntu?
if (EXISTS "/etc/debian_version") if (EXISTS "/etc/debian_version")
@ -22,7 +19,6 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# 64-bit system? # 64-bit system?
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_def "lib64") set (_libdir_def "lib64")
set (LIBDIR_MULTIARCH_UNAWARE "${_libdir_def}")
else (CMAKE_SIZEOF_VOID_P EQUAL 8) else (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_def "lib") set (_libdir_def "lib")
endif (CMAKE_SIZEOF_VOID_P EQUAL 8) endif (CMAKE_SIZEOF_VOID_P EQUAL 8)