From 0da814597b847b80eac626071b2132887a78385f Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 17 Mar 2014 09:55:38 +0100 Subject: [PATCH] Change Cmake macro to fix build for x86_64 arch. Change-Id: I2b285fc321ed435be4f6bc236c587526ae56e30e Signed-off-by: Ronan Le Martret --- CMakeLists.txt | 6 +++--- packaging/tinycompress.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82a26d1..63f6f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ PROJECT(tinycompress C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") +SET(LIBDIR "\${prefix}/${LIB_INSTALL_DIR}") SET(INCLUDEDIR "\${prefix}/include") # Set required packages @@ -46,6 +46,6 @@ CONFIGURE_FILE(tinycompress.pc.in tinycompress.pc @ONLY) # install INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/tinycompress-0.2.0) -INSTALL(TARGETS tinycompress LIBRARY DESTINATION lib) +INSTALL(TARGETS tinycompress LIBRARY DESTINATION ${LIB_INSTALL_DIR}) INSTALL(TARGETS cplay RUNTIME DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinycompress.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinycompress.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/packaging/tinycompress.spec b/packaging/tinycompress.spec index 8aea42d..56677dc 100644 --- a/packaging/tinycompress.spec +++ b/packaging/tinycompress.spec @@ -26,7 +26,7 @@ tinycompress headers and libraries for development. %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} make %{?jobs:-j%jobs} %install -- 2.34.1