Merge pull request #6088 from Xreki/fix_capi_build_with_python

Fix the compiling error when seting WITH_C_API=ON and WITH_PYTHON=ON.

Author: luotao1

CMakeLists.txt

@@ -81,6 +81,8 @@ if(ANDROID OR IOS)
  "Disable RDMA when cross-compiling for Android and iOS" FORCE)
  set(WITH_MKL OFF CACHE STRING
  "Disable MKL when cross-compiling for Android and iOS" FORCE)
+ set(WITH_GOLANG OFF CACHE STRING
+ "Disable golang when cross-compiling for Android and iOS" FORCE)
 
  # Compile PaddlePaddle mobile inference library
  if (NOT WITH_C_API)

paddle/pserver/CMakeLists.txt

@@ -49,7 +49,7 @@ if(WITH_TESTING)
  add_subdirectory(test)
 endif()
 
-if(NOT WITH_C_API)
+if(NOT MOBILE_INFERENCE)
  add_executable(paddle_pserver_main ${PSERVER_MAIN_SOURCES})
  link_paddle_exe(paddle_pserver_main)
 

paddle/trainer/CMakeLists.txt

@@ -54,7 +54,7 @@ if(WITH_TESTING)
  add_subdirectory(tests)
 endif()
 
-if(NOT WITH_C_API)
+if(NOT MOBILE_INFERENCE)
  add_paddle_exe(paddle_trainer TrainerMain.cpp)
  add_paddle_exe(paddle_merge_model MergeModel.cpp)
 
@@ -74,7 +74,5 @@ endif()
 if(WITH_GOLANG)
  add_dependencies(paddle_trainer_lib paddle_pserver_cclient)
  target_link_libraries(paddle_trainer_lib paddle_pserver_cclient)
- if(NOT WITH_C_API)
- target_link_libraries(paddle_trainer paddle_pserver_cclient)
- endif()
+ target_link_libraries(paddle_trainer paddle_pserver_cclient)
 endif(WITH_GOLANG)