Fix libdir in pc file and remove unused variables from cmake

Change-Id: I55d6b94a0511188e1d8f29dd0cee9bf09d03fb22
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc3ed99..095746a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.6)
-PROJECT(noise-suppression C CXX)
-
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-IF(NOT DEFINED BINDIR)
-    SET(BINDIR "${PREFIX}/bin")
-ENDIF(NOT DEFINED BINDIR)
-IF(NOT DEFINED MANIFESTDIR)
-    SET(MANIFESTDIR "/usr/share/packages")
-ENDIF(NOT DEFINED MANIFESTDIR)
-IF(NOT DEFINED LICENSEDIR)
-    SET(LICENSEDIR "/usr/share/license")
-ENDIF(NOT DEFINED LICENSEDIR)
+PROJECT(noise-suppression VERSION ${VERSION} LANGUAGES C CXX)
 
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
@@ -37,7 +26,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie -fPIC
 SET(PKG_LDFLAGS "m")
 
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-       MESSAGE("Not using x86_64 architecture")
+       MESSAGE("Not using fast math for x86_64 architecture")
 else ()
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFLOAT_APPROX -ffast-math")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DFLOAT_APPROX -ffast-math")
@@ -52,10 +41,6 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 endif()
 
 SET(LIB_NAME "${PROJECT_NAME}")
-SET(LIB_PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIB_DIR ${LIBDIR})
-SET(LIB_INCLUDE_DIR "${LIB_PREFIX}/include")
-SET(LIB_PKGCONFIG_DIR "${LIB_DIR}/pkgconfig")
 
 MESSAGE(CFLAGS='${CMAKE_C_FLAGS}')
 MESSAGE(CXXFLAGS='${CMAKE_CXX_FLAGS}')
@@ -87,14 +72,14 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${TIZEN_PKGS_LDFLAGS} ${PKG_LDFLAGS})
 
 SET_TARGET_PROPERTIES(${LIB_NAME}
        PROPERTIES
-       VERSION ${VERSION}
-       SOVERSION ${MAJORVER}
+       VERSION ${PROJECT_VERSION}
+       SOVERSION ${PROJECT_VERSION_MAJOR}
        CLEAN_DIRECT_OUTPUT 1
        )
 
-INSTALL(TARGETS ${LIB_NAME} DESTINATION ${LIB_DIR})
+INSTALL(TARGETS ${LIB_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
-       DIRECTORY ${INC_DIR}/ DESTINATION ${LIB_INCLUDE_DIR}
+       DIRECTORY ${INC_DIR}/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
        FILES_MATCHING
        PATTERN "${INC_DIR}/noise-suppression.h"
        PATTERN "${INC_DIR}/noise-suppression-type.h"
@@ -109,16 +94,6 @@ CONFIGURE_FILE(
        ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc
        @ONLY
        )
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION ${LIB_PKGCONFIG_DIR})
-
-# make uninstall
-ADD_CUSTOM_TARGET("uninstall" COMMENT "Uninstall installed files")
-ADD_CUSTOM_COMMAND(
-    TARGET "uninstall"
-    POST_BUILD
-    COMMENT "Uninstall files with install_manifest.txt"
-    COMMAND xargs rm -vf < install_manifest.txt || echo Nothing in
-            install_manifest.txt to be uninstalled!
-)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(tool)

diff --git a/noise-suppression.pc.in b/noise-suppression.pc.in
index c62b1ce..bddc733 100644 (file)
--- a/noise-suppression.pc.in
+++ b/noise-suppression.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/lib
-includedir=${prefix}/include
+libdir=@LIB_INSTALL_DIR@
+includedir=@CMAKE_INSTALL_PREFIX@/include
 
 Name: @PROJECT_NAME@
 Description: RNN based noise suppression

diff --git a/packaging/noise-suppression.spec b/packaging/noise-suppression.spec
index 4411027..c30612f 100644 (file)
--- a/packaging/noise-suppression.spec
+++ b/packaging/noise-suppression.spec
@@ -1,6 +1,6 @@
 Name: noise-suppression
 Summary: Acoustic noise suppression library
-Version: 1.1
+Version: 1.2
 Release: 0
 License: BSD-3-Clause
 Source0: %{name}-%{version}.tar.gz
@@ -28,11 +28,9 @@ Acoustic noise suppression library (Tool)
 %setup -q
 
 %build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DVERSION=%{version} \
-       -DMAJORVER=${MAJORVER} \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DLIBDIR=%{_libdir}
+       -DLIB_INSTALL_DIR=%{_libdir}
 
 make %{?jobs:-j%jobs}