From 835ccb326252846fa54c17298d235751c82fd974 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Thu, 18 May 2017 16:31:14 +0800
Subject: [PATCH] refine cc_xxx in generic

---
 cmake/generic.cmake             | 16 ++++++++++------
 paddle/majel/test/place_test.cc |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmake/generic.cmake b/cmake/generic.cmake
index 22a26d7c5..06b09a6ef 100644
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -57,8 +57,9 @@ function(cc_binary TARGET_NAME)
   set(multiValueArgs SRCS DEPS)
   cmake_parse_arguments(cc_binary "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   add_executable(${TARGET_NAME} ${cc_binary_SRCS})
-  add_dependencies(${TARGET_NAME} ${cc_binary_DEPS} ${external_project_dependencies})
+  link_paddle_exe(${TARGET_NAME})
   target_link_libraries(${TARGET_NAME} ${cc_binary_DEPS})
+  add_dependencies(${TARGET_NAME} ${cc_binary_DEPS})
 endfunction(cc_binary)
 
 # The dependency to target tensor implies that if any of
@@ -74,8 +75,9 @@ function(cc_test TARGET_NAME)
   set(multiValueArgs SRCS DEPS)
   cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   add_executable(${TARGET_NAME} ${cc_test_SRCS})
-  add_dependencies(${TARGET_NAME} ${cc_test_DEPS} ${external_project_dependencies})
-  target_link_libraries(${TARGET_NAME} ${cc_test_DEPS} ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES})
+  link_paddle_test(${TARGET_NAME})
+  target_link_libraries(${TARGET_NAME} ${cc_test_DEPS})
+  add_dependencies(${TARGET_NAME} ${cc_test_DEPS})
   add_test(${TARGET_NAME} ${TARGET_NAME})
 endfunction(cc_test)
 
@@ -106,8 +108,9 @@ function(nv_binary TARGET_NAME)
   set(multiValueArgs SRCS DEPS)
   cmake_parse_arguments(nv_binary "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   cuda_add_executable(${TARGET_NAME} ${nv_binary_SRCS})
-  add_dependencies(${TARGET_NAME} ${nv_binary_DEPS} ${external_project_dependencies})
+  link_paddle_exe(${TARGET_NAME})  
   target_link_libraries(${TARGET_NAME} ${nv_binary_DEPS})
+  add_dependencies(${TARGET_NAME} ${nv_binary_DEPS})
 endfunction(nv_binary)
 
 # The dependency to target tensor implies that if any of
@@ -123,7 +126,8 @@ function(nv_test TARGET_NAME)
   set(multiValueArgs SRCS DEPS)
   cmake_parse_arguments(nv_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   cuda_add_executable(${TARGET_NAME} ${nv_test_SRCS})
-  add_dependencies(${TARGET_NAME} ${nv_test_DEPS} ${external_project_dependencies})
-  target_link_libraries(${TARGET_NAME} ${nv_test_DEPS} ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES})
+  link_paddle_test(${TARGET_NAME})  
+  target_link_libraries(${TARGET_NAME} ${nv_test_DEPS})
+  add_dependencies(${TARGET_NAME} ${nv_test_DEPS})
   add_test(${TARGET_NAME} ${TARGET_NAME})
 endfunction(nv_test)
diff --git a/paddle/majel/test/place_test.cc b/paddle/majel/test/place_test.cc
index c9a53802b..686ed9c0e 100644
--- a/paddle/majel/test/place_test.cc
+++ b/paddle/majel/test/place_test.cc
@@ -1,6 +1,7 @@
 #include "majel/place.h"
 #include <sstream>
 #include "gtest/gtest.h"
+#include "paddle/utils/Logging.h"
 
 TEST(Place, Equality) {
   majel::CpuPlace cpu;
@@ -37,4 +38,5 @@ TEST(Place, Print) {
     ss << majel::CpuPlace();
     EXPECT_EQ("CpuPlace", ss.str());
   }
+  LOG(INFO) << "\n[----------] Done \n";
 }
-- 
GitLab