Fix Cmake configuration file

- Use working directory option instead of 'cd' command
- Change required minimum version of cmake

Change-Id: I7231fb68d60da4c1e56a792b69256df3199f1c15
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc29aef..973c468 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(alarm C CXX)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(alarm)
 
 INCLUDE(FindPkgConfig)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")

diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index e3bfbb1..bb6ae2b 100644 (file)
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -206,7 +206,8 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj/%{name}
 %endif
 
 %check
-(cd unittest && LD_LIBRARY_PATH=../lib ctest -V)
+export LD_LIBRARY_PATH=lib
+ctest -V
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o alarm-manager.info
 genhtml alarm-manager.info -o alarm-manager.out

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index c645f90..13f5701 100755 (executable)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -1,4 +1,3 @@
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server)
@@ -35,6 +34,7 @@ LINK_DIRECTORIES(${svr_pkgs_LIBRARY_DIRS})
 ADD_EXECUTABLE(${GTEST_TEST} ${GTEST_TEST_SRCS} ${GTEST_SERVER_SRCS})
 TARGET_LINK_LIBRARIES(${GTEST_TEST} ${gtest_pkgs_LIBRARIES} ${LIBRARY} ${svr_pkgs_LIBRARIES} alarm rt)
 
-ADD_TEST(${GTEST_TEST} ${GTEST_TEST})
+ADD_TEST(NAME ${GTEST_TEST} COMMAND ${GTEST_TEST}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest)
 
 iNSTALL(TARGETS ${GTEST_TEST} DESTINATION bin)