Commit b6794af3 authored by Niels Breet's avatar Niels Breet

Merge branch 'jb49681' into 'master'

[aarch64] Use macros, not hardcoded paths. Contributes to JB#49681

See merge request !1
parents 905facb2 a14b6b4e
......@@ -14,19 +14,6 @@ find_package(PkgConfig)
pkg_check_modules(LIBRESOURCE_GLIB REQUIRED libresource-glib)
include_directories(${LIBRESOURCE_GLIB_INCLUDE_DIRS})
# Multiarch support
if(NOT LIB_DEST)
if(CMAKE_LIBRARY_ARCHITECTURE)
set(LIB_DEST "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
else()
if (${CMAKE_C_SIZEOF_DATA_PTR} EQUAL 8)
set(LIB_DEST "lib64")
else()
set(LIB_DEST "lib")
endif()
endif()
endif()
# pkg-config support
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/audioresource.pc.in
${CMAKE_CURRENT_BINARY_DIR}/audioresource.pc
......
......@@ -27,7 +27,7 @@ This package contains the development library for %{name}.
%setup -q
%build
%cmake -DLIB_DEST=lib
%cmake -DLIB_DEST=%{_lib}
make
%install
......
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