Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: Ia62e9c30dfeb5bcbee83177fc50fd6b995d3933b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a62cf9..bc6d74a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(haptic-module C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)

diff --git a/packaging/haptic-module-tizen.spec b/packaging/haptic-module-tizen.spec
index b2e5ed8..361b198 100644 (file)
--- a/packaging/haptic-module-tizen.spec
+++ b/packaging/haptic-module-tizen.spec
@@ -22,12 +22,12 @@ Requires(postun): /sbin/ldconfig
 
 %build
 %if 0%{?simulator}
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DSIMULATOR=yes
+%cmake . -DSIMULATOR=yes
 %else
 %ifarch %{ix86}
 CFLAGS=`echo %{optflags} |sed 's/\-fexceptions//g'`
 %endif
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DSIMULATOR=no
+%cmake . -DSIMULATOR=no
 %endif
 make %{?jobs:-j%jobs}
 

diff --git a/tizen/DEVICE/CMakeLists.txt b/tizen/DEVICE/CMakeLists.txt
index 5c6a7fb..8d68793 100644 (file)
--- a/tizen/DEVICE/CMakeLists.txt
+++ b/tizen/DEVICE/CMakeLists.txt
@@ -27,4 +27,4 @@ ADD_DEFINITIONS("-DENABLE_DLOG_OUT -DSLP_DEBUG")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${rpkgs_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/tizen/SIMULATOR/CMakeLists.txt b/tizen/SIMULATOR/CMakeLists.txt
index 57ba588..91a79a3 100644 (file)
--- a/tizen/SIMULATOR/CMakeLists.txt
+++ b/tizen/SIMULATOR/CMakeLists.txt
@@ -24,4 +24,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${rpkgs_LDFLAGS})
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DENABLE_DLOG_OUT -DSLP_DEBUG")
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})