fix TC error due to /usr/lib path 77/44577/1 tizen_3.0.m1_mobile accepted/tizen/mobile/20150727.033949 submit/tizen/20150727.012855 tizen_3.0.m1_mobile_release tizen_3.0.m2.a1_mobile_release
authorWonnam Jang <wn.jang@samsung.com>
Thu, 23 Jul 2015 10:29:15 +0000 (19:29 +0900)
committerWonnam Jang <wn.jang@samsung.com>
Thu, 23 Jul 2015 10:29:15 +0000 (19:29 +0900)
Change-Id: Iddff794ae18828605ce2c408f574d8d9cf6f7c3a

CMakeLists.txt
src/vc_elm_core.h

index 52b1acf8054ea8fb12363d1a0c8d658474f62a20..ec420c89e42195cedee64cca8c6ca3a99543eccc 100644 (file)
@@ -23,6 +23,10 @@ INCLUDE(FindPkgConfig)
 SET(CMAKE_BUILD_TYPE "Release")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g -fprofile-arcs -ftest-coverage -D_GNU_SOURCE")
 
+IF (LIBDIR MATCHES "/usr/lib64")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLIB64")
+ENDIF (LIBDIR)
+
 # CMake settings
 MESSAGE(STATUS "========================================")
 MESSAGE(STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR})
index 85dca87e186c01bd6fc1ddb85c43506a3a6233ae..cabdc4bcb33a97e1bb47079e69804e8cb50059c5 100644 (file)
@@ -29,7 +29,11 @@ extern "C" {
  * @brief This file contains core functions, that define the behaviour of library
  */
 
+#ifdef LIB64
+#define VC_ELM_CONFIG_XML              "/usr/lib64/voice/vc-elm/1.0/voice-control-elm-config.xml"
+#else
 #define VC_ELM_CONFIG_XML              "/usr/lib/voice/vc-elm/1.0/voice-control-elm-config.xml"
+#endif
 #define VC_ELM_TAG_BASE_NAME           "voice-control-elm-config"
 
 #define VC_ELM_TAG_ACTION_LIST         "action-list"