Skip to content
Permalink
Browse files
Merge branch 'jb49681' into 'master'
[aarch64] Use macros, not hardcoded paths. Contributes to JB#49681

See merge request mer-core/libaudioresource!1
  • Loading branch information
xfade committed May 26, 2020
2 parents 905facb + a14b6b4 commit b6794af30ff5c430c27b8cb4849ff18f716c4c29
Showing with 1 addition and 14 deletions.
  1. +0 −13 CMakeLists.txt
  2. +1 −1 rpm/libaudioresource.spec
@@ -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

0 comments on commit b6794af

Please sign in to comment.