diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79c67ac7..0ef7749b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,9 @@ add_definitions(-std=c++11)
 set(CMAKE_CXX_FLAGS "-g -O2")
 
 # CMake doesn't have a way to pure template library, 
-add_library(cppbtree btree.h btree_map.h btree_set.h safe_btree.h safe_btree_map.h safe_btree_set.h)
-set_target_properties(cppbtree PROPERTIES LINKER_LANGUAGE CXX)
+# add_library(cppbtree btree.h btree_map.h btree_set.h 
+#             safe_btree.h safe_btree_map.h safe_btree_set.h)
+# set_target_properties(cppbtree PROPERTIES LINKER_LANGUAGE CXX)
 
 if(build_tests)
   enable_testing()
@@ -17,7 +18,7 @@ if(build_tests)
   add_executable(btree_test btree_test.cc btree_test_flags.cc)
   add_executable(safe_btree_test safe_btree_test.cc btree_test_flags.cc)
   add_executable(btree_bench btree_bench.cc btree_test_flags.cc)
-  target_link_libraries(btree_test gtest_main gflags)
-  target_link_libraries(safe_btree_test gtest_main gflags)
+  target_link_libraries(btree_test gtest_main gtest gflags)
+  target_link_libraries(safe_btree_test gtest_main gtest gflags)
   target_link_libraries(btree_bench gflags gtest)
 endif()