back to cmake - v2.6 - in trunk

.gitignore

@@ -17,3 +17,5 @@ boost
 t
 tags
 *.gcno
+Makefile
+core

CMakeLists.txt.bak → CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 ENABLE_TESTING()
 set(PROJ_NAME "cpp_phone_bill")
 project(${PROJ_NAME} CXX)

cmake/Modules/FindGMock.cmake

@@ -9,13 +9,10 @@ if(GMOCK-CONFIG_EXECUTABLE)
 	exec_program(${GMOCK-CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE GOOGLEMOCK_INCLUDE_DIR)
 	exec_program(${GMOCK-CONFIG_EXECUTABLE} ARGS --ldflags OUTPUT_VARIABLE GOOGLEMOCK_LDFLAGS)
 	exec_program(${GMOCK-CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE GOOGLEMOCK_libs_tmp)
-	set(GOOGLEMOCK_LIBRARIES ${GOOGLEMOCK_LDFLAGS} ${GOOGLEMOCK_libs_tmp})
+	set(GOOGLEMOCK_LIBRARIES "${GOOGLEMOCK_LDFLAGS} ${GOOGLEMOCK_libs_tmp}")
+    set(GMOCK_FOUND TRUE)
 endif()
 
-if(GOOGLEMOCK_INCLUDE_DIR AND GOOGLEMOCK_LIBRARIES)
-	set(GMOCK_FOUND TRUE)
-endif()
-
-if (NOT ${GMOCK_FOUND})
+if (${GMOCK_FOUND})
 	message (FATAL_ERROR "GMOCK not found!")
 endif ()

cmake/Modules/FindGTest.cmake

@@ -0,0 +1,18 @@
+# Picked and modified from: http://osdir.com/ml/kde-commits/2010-05/msg09988.html
+# Another reference point: http://code.google.com/p/createtetzone/
+# Locate the Google C++ Mocking Framework.
+
+set (GTEST_FOUND FALSE)
+find_program(GTEST-CONFIG_EXECUTABLE NAMES gtest-config PATHS)
+
+if(GTEST-CONFIG_EXECUTABLE)
+	exec_program(${GTEST-CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE GOOGLETEST_INCLUDE_DIR)
+	exec_program(${GTEST-CONFIG_EXECUTABLE} ARGS --ldflags OUTPUT_VARIABLE GOOGLETEST_LDFLAGS)
+	exec_program(${GTEST-CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE GOOGLETEST_libs_tmp)
+	set(GOOGLETEST_LIBRARIES "${GOOGLETEST_LDFLAGS} ${GOOGLETEST_libs_tmp}")
+	set(GTEST_FOUND TRUE)
+endif()
+
+if (${GTEST_FOUND})
+	message (FATAL_ERROR "GTEST not found!")
+endif ()

test/CMakeLists.txt

@@ -2,13 +2,12 @@ enable_testing()
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 find_package(GTest REQUIRED)
 find_package(GMock REQUIRED)
-find_library(GMOCK_LIB libgmock)
-find_path(GMOCK_INC gmock/gmock.h)
 
 include_directories(${GMOCK_INC})
 include_directories(${GTEST_INCLUDE_DIRS})
 
 file(GLOB_RECURSE TEST_FILES "*.cc") 
 add_executable(${TEST_EXEC} ${TEST_FILES})
-target_link_libraries(${TEST_EXEC} ${SRC_OBJ} ${GTEST_BOTH_LIBRARIES} ${GOOGLEMOCK_LIBRARIES} pthread)
+target_link_libraries(${TEST_EXEC} ${SRC_OBJ}
+    ${GOOGLEMOCK_LIBRARIES} pthread gmock)
 add_test(${TEST_EXEC} ${TEST_EXEC})