提交 48128e51 编写于 作者: Y Yu Yang 提交者: GitHub

Merge pull request #868 from emailweixu/fix_enable_virtualenv

Fix enable_virtualenv
...@@ -119,7 +119,7 @@ function(link_paddle_exe TARGET_NAME) ...@@ -119,7 +119,7 @@ function(link_paddle_exe TARGET_NAME)
${RDMA_LD_FLAGS} ${RDMA_LD_FLAGS}
${RDMA_LIBS}) ${RDMA_LIBS})
endif() endif()
if(WITH_PYTHON) if(WITH_PYTHON)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
${PYTHON_LIBRARIES}) ${PYTHON_LIBRARIES})
...@@ -136,10 +136,10 @@ function(link_paddle_exe TARGET_NAME) ...@@ -136,10 +136,10 @@ function(link_paddle_exe TARGET_NAME)
endif() endif()
if(WITH_GPU) if(WITH_GPU)
if(NOT WITH_DSO OR WITH_METRIC) if(NOT WITH_DSO OR WITH_METRIC)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
${CUDNN_LIBRARY} ${CUDNN_LIBRARY}
${CUDA_curand_LIBRARY}) ${CUDA_curand_LIBRARY})
CUDA_ADD_CUBLAS_TO_TARGET(${TARGET_NAME}) CUDA_ADD_CUBLAS_TO_TARGET(${TARGET_NAME})
endif() endif()
...@@ -206,5 +206,5 @@ function(create_resources res_file output) ...@@ -206,5 +206,5 @@ function(create_resources res_file output)
# Convert hex data for C compatibility # Convert hex data for C compatibility
string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," filedata ${filedata}) string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," filedata ${filedata})
# Append data to output file # Append data to output file
file(APPEND ${output} "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n") file(APPEND ${output} "const unsigned char ${filename}[] = {${filedata}0};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
endfunction() endfunction()
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册