From 6b634d83783cb8362f4bcac56b479855b5ed6eb1 Mon Sep 17 00:00:00 2001 From: BostonVaulter Date: Tue, 15 Feb 2011 07:44:21 +0000 Subject: [PATCH] Reformat part of google test integration cmake file --- cmake/CMakeLists_test.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/CMakeLists_test.txt b/cmake/CMakeLists_test.txt index a54eab73..645722be 100644 --- a/cmake/CMakeLists_test.txt +++ b/cmake/CMakeLists_test.txt @@ -67,6 +67,11 @@ ELSE(UNIX) ENDIF(UNIX) +# Include all files that have unit tests +SET(inc_dirs_tests + ${root_dir}/lib/synergy/CProtocolUtilTest.cpp +) + SET(inc_dirs_test ${root_dir} ${root_dir}/lib @@ -84,8 +89,5 @@ SET(inc_dirs_test ) INCLUDE_DIRECTORIES(${inc_dirs_test}) -#ADD_EXECUTABLE(tests ${root_dir}/third_party/gtest/src/gtest-all.cc) -#ADD_EXECUTABLE(tests ${root_dir}/lib/synergy/CProtocolUtilTest.cpp) -#ADD_LIBRARY(prototest STATIC ${src_cmd_synergyc_common}) -ADD_EXECUTABLE(tests ${root_dir}/third_party/gtest/src/gtest_main.cc ${root_dir}/lib/synergy/CProtocolUtilTest.cpp) +ADD_EXECUTABLE(tests ${root_dir}/third_party/gtest/src/gtest_main.cc ${inc_dirs_tests}) TARGET_LINK_LIBRARIES(tests synergy gtest ${libs})