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

Noarch lib-dir was only used in one wrong place

Browse Source 
dune.module does not contain any paths to architecture-specific
binaries. It is therefore always installed in no-arch lib/ directory.
Thus, there is no need to have a variable for this, and there was
no other users of this variable either.
This commit is contained in:
Roland Kaufmann 2013-08-27 22:26:21 +02:00
parent eb1086a2b8
commit a066aa519c
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/OpmInstall.cmake
View File

@ -50,6 +50,6 @@ macro (opm_install opm)
endif (${opm}_LIBRARY_TYPE STREQUAL "SHARED" AND ${opm}_TARGET AND ${opm}_DEBUG) endif (${opm}_LIBRARY_TYPE STREQUAL "SHARED" AND ${opm}_TARGET AND ${opm}_DEBUG)
install ( install (
FILES ${PROJECT_SOURCE_DIR}/dune.module FILES ${PROJECT_SOURCE_DIR}/dune.module
DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME} DESTINATION lib${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME}
) )
endmacro (opm_install opm) endmacro (opm_install opm)

16
cmake/Modules/UseMultiArch.cmake
View File

@ -5,10 +5,6 @@
# depending on the platform; use this path # depending on the platform; use this path
# for platform-specific binaries. # 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 # Note that it will override the results of GNUInstallDirs if included after
# that module. # that module.
@ -22,21 +18,15 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
else (EXISTS "/etc/debian_version") else (EXISTS "/etc/debian_version")
# 64-bit system? # 64-bit system?
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_noarch "lib64") set (_libdir_def "lib64")
else (CMAKE_SIZEOF_VOID_P EQUAL 8) else (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_noarch "lib") set (_libdir_def "lib")
endif (CMAKE_SIZEOF_VOID_P EQUAL 8) endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_def "${_libdir_noarch}")
endif (EXISTS "/etc/debian_version") endif (EXISTS "/etc/debian_version")
else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
set (_libdir_def "lib") set (_libdir_def "lib")
set (_libdir_noarch "lib")
endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# let the user override if somewhere else is desirable # let the user override if somewhere else is desirable
set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries") 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)
mark_as_advanced (
CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_LIBDIR_NOARCH
)