From 02bf31f81bd22c8862e82259e6a659862646ed0c Mon Sep 17 00:00:00 2001 From: dhead666 Date: Fri, 7 Aug 2015 08:11:48 +0300 Subject: [PATCH 1/3] add UseMultiArch.cmake file --- UseMultiArch.cmake | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 UseMultiArch.cmake diff --git a/UseMultiArch.cmake b/UseMultiArch.cmake new file mode 100644 index 0000000..242e9fe --- /dev/null +++ b/UseMultiArch.cmake @@ -0,0 +1,48 @@ +# - Multiarch support in object code library directories +# +# This module sets the following variable +# CMAKE_INSTALL_LIBDIR to lib, lib64 or lib/x86_64-linux-gnu +# depending on the platform; use this path +# 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 +# that module. + +# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu; +# Fedora put module files in lib64/ too, but Debian uses lib/ for that +if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" AND + "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + # Debian or Ubuntu? + if (EXISTS "/etc/debian_version") + set (_libdir_def "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + set (_libdir_noarch "lib") + elseif (EXISTS "/etc/fedora-release" OR + EXISTS "/etc/redhat-release" OR + EXISTS "/etc/slackware-version") + # 64-bit system? + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_noarch "lib64") + else (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_noarch "lib") + endif (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_def "${_libdir_noarch}") + else () + set (_libdir_def "lib") + set (_libdir_noarch "lib") + endif () +else () + set (_libdir_def "lib") + set (_libdir_noarch "lib") +endif () + +# let the user override if somewhere else is desirable +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 + CMAKE_INSTALL_LIBDIR_NOARCH + ) From 5ae8bfeb0bda38866325b6fa2915520af967c2ac Mon Sep 17 00:00:00 2001 From: dhead666 Date: Fri, 7 Aug 2015 08:15:58 +0300 Subject: [PATCH 2/3] CMakelists.txt add missing files and install headers --- CMakeLists.txt | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb381f..f9f7fec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,19 @@ endif() #set(asplib_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") #set(asplib_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${TINYXML_LIBRARIES}) -set(SOURCES utils/computeDeviceInfo/cpuInfo.cpp) +set(SOURCES utils/computeDeviceInfo/cpuInfo.cpp + Biquads/Biquad_Native/asplib_Biquad_Native.cpp + Biquads/apslib_BiquadFactory.cpp) + +set(HEADERS interfaces/asplib_IBaseBiquad.h + constants_typedefs/asplib_constants.h + constants_typedefs/asplib_typedefs.h + utils/computeDeviceInfo/cpuInfo_types.h + utils/computeDeviceInfo/cpuInfo.h + Biquads/apslib_BiquadFactory.h + Biquads/Biquad_Native/asplib_Biquad_Native.h) + + #include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR}) add_library(asplib ${SOURCES} ${PLAT_SOURCES}) @@ -29,9 +41,17 @@ target_link_libraries(asplib ${asplib_LIBRARIES}) # SOVERSION ${asplib_VERSION_MAJOR}.0) install(TARGETS asplib DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES interfaces/asplib_IBaseBiquad.h + DESTINATION include/asplib/interfaces) +install(FILES constants_typedefs/asplib_constants.h + constants_typedefs/asplib_typedefs.h + DESTINATION include/asplib/constants_typedefs) install(FILES utils/computeDeviceInfo/cpuInfo_types.h utils/computeDeviceInfo/cpuInfo.h DESTINATION include/asplib/utils) +install(FILES Biquads/apslib_BiquadFactory.h + Biquads/Biquad_Native/asplib_Biquad_Native.h + DESTINATION include/asplib/Biquads) #IF(NOT WIN32) # Pkgconfig From d385527074a3ca67e39f14c14dea7b3835ca9c3d Mon Sep 17 00:00:00 2001 From: dhead666 Date: Fri, 7 Aug 2015 08:18:42 +0300 Subject: [PATCH 3/3] CMakeLists.txt: on Linux set GCC flag TARGET_LINUX --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9f7fec..8793f4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,10 @@ if(NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") endif() +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(CMAKE_CXX_FLAGS "-DTARGET_LINUX") +endif() + #set(asplib_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") #set(asplib_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${TINYXML_LIBRARIES})