From 401008d7795dd03105f33d6d08290ec50c85a1f3 Mon Sep 17 00:00:00 2001 From: Junfeng Dong Date: Mon, 8 Apr 2013 16:56:14 +0800 Subject: [PATCH] Fix for 64 bit compatibility. - Fix hardcoding path. - Use %cmake to set default paths. Change-Id: Ic00d70c3b032f1e670b25de3a1de8291f9c18dd8 --- client/CMakeLists.txt | 8 ++++---- packaging/stt.spec | 2 +- server/CMakeLists.txt | 5 +++-- server/sttd_main.h | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 0a15388..06e3cc7 100755 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT(stt C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}") -SET(LIBDIR "${PREFIX}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "${PREFIX}/include") SET(VERSION 0.0.1) @@ -62,7 +62,7 @@ CONFIGURE_FILE(stt.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" @ONLY) CONFIGURE_FILE(stt-setting.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" @ONLY) ## Install library files ## -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) -INSTALL(TARGETS "${PROJECT_NAME}_setting" DESTINATION lib COMPONENT RuntimeLibraries) -INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(TARGETS "${PROJECT_NAME}_setting" DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/stt.h ${CMAKE_CURRENT_SOURCE_DIR}/stt_setting.h DESTINATION include) diff --git a/packaging/stt.spec b/packaging/stt.spec index 5bc3db4..5f079c7 100755 --- a/packaging/stt.spec +++ b/packaging/stt.spec @@ -35,7 +35,7 @@ Speech To Text header files for STT development. %build -cmake . -DCMAKE_INSTALL_PREFIX=/usr +%cmake . make %{?jobs:-j%jobs} %install diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 15ff446..3d35d17 100755 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT(stt-daemon) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}") -SET(LIBDIR "${PREFIX}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "${PREFIX}/include") SET(VERSION 0.0.1) @@ -40,6 +40,7 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") +ADD_DEFINITIONS("-DLIBDIR_PREFIX=\"${LIB_INSTALL_DIR}\"") ## Executable ## ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) @@ -48,4 +49,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} -ldl -lm ${pkgs_LDFLAGS}) ## Install INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sttp.h DESTINATION include) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sttd.conf DESTINATION lib/voice/stt/1.0) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sttd.conf DESTINATION ${LIB_INSTALL_DIR}/voice/stt/1.0) diff --git a/server/sttd_main.h b/server/sttd_main.h index 3245197..378dc13 100755 --- a/server/sttd_main.h +++ b/server/sttd_main.h @@ -34,9 +34,9 @@ extern "C" { #define TAG_STTD "sttd" -#define BASE_DIRECTORY_DEFAULT "/usr/lib/voice/stt/1.0/" -#define ENGINE_DIRECTORY_DEFAULT "/usr/lib/voice/stt/1.0/engine" -#define ENGINE_DIRECTORY_DEFAULT_SETTING "/usr/lib/voice/stt/1.0/setting" +#define BASE_DIRECTORY_DEFAULT LIBDIR_PREFIX "/voice/stt/1.0/" +#define ENGINE_DIRECTORY_DEFAULT LIBDIR_PREFIX "/voice/stt/1.0/engine" +#define ENGINE_DIRECTORY_DEFAULT_SETTING LIBDIR_PREFIX "/voice/stt/1.0/setting" #define CONFIG_DIRECTORY "/opt/home/app/.voice" -- 2.7.4