Merge pull request #2469 from emailweixu/fix_pserver

Fix pserver cmake

go/pserver/cclient/CMakeLists.txt

@@ -13,8 +13,8 @@ go_library(paddle_pserver_cclient STATIC)
 
 if(PROJ_ROOT)
   add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/trainer/libpaddle_pserver_cclient.a
-          COMMAND cp ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.h ${PROJ_ROOT}/paddle/trainer/
-          COMMAND cp ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.a ${PROJ_ROOT}/paddle/trainer/
+          COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/libpaddle_pserver_cclient.h ${PROJ_ROOT}/paddle/trainer/
+          COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/libpaddle_pserver_cclient.a ${PROJ_ROOT}/paddle/trainer/
           WORKING_DIRECTORY ${PROJ_ROOT}/paddle
           DEPENDS paddle_pserver_cclient)
   add_custom_target(paddle_pserver_cclient_lib ALL DEPENDS ${PROJ_ROOT}/paddle/trainer/libpaddle_pserver_cclient.a)

go/pserver/cclient/test/CMakeLists.txt

@@ -8,13 +8,13 @@ add_dependencies(test_cclient paddle_pserver_cclient)
 if(APPLE)
   set(CMAKE_EXE_LINKER_FLAGS "-framework CoreFoundation -framework Security")
 else()
-  set(CMAKE_EXE_LINKER_FLAGS "-pthread")  
+  set(CMAKE_EXE_LINKER_FLAGS "-pthread")
 endif()
 
 if(PROJ_ROOT)
-  include_directories(${CMAKE_BINARY_DIR}/go/pserver/cclient/)
-  target_link_libraries(main ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.a pthread)
-  target_link_libraries(test_cclient ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.a pthread)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
+  target_link_libraries(main ${CMAKE_CURRENT_BINARY_DIR}/../libpaddle_pserver_cclient.a pthread)
+  target_link_libraries(test_cclient ${CMAKE_CURRENT_BINARY_DIR}/../libpaddle_pserver_cclient.a pthread)
 else(PROJ_ROOT)
   include_directories(${CMAKE_BINARY_DIR})
   target_link_libraries(main ${CMAKE_BINARY_DIR}/libpaddle_pserver_cclient.a pthread)