OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Python: enable more status messages and warnings for gRPC code generation

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-24 11:13:23 +02:00
parent 6b7a9b8da5
commit c2c312068c
2 changed files with 96 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/CMakeLists.txt
View File

@@ -538,7 +538,8 @@ endforeach()
# Copy all grpc libraries and python files
if (RESINSIGHT_ENABLE_GRPC)
if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
if (PYTHON_EXECUTABLE)
if (EXISTS ${PYTHON_EXECUTABLE})
add_custom_target(GeneratedPythonSources DEPENDS ${GRPC_GENERATED_PYTHON_SOURCES})
add_dependencies(ResInsight GeneratedPythonSources)
@@ -549,7 +550,12 @@ if (RESINSIGHT_ENABLE_GRPC)
COPYONLY)
endif(EXISTS "${GRPC_PYTHON_SOURCE_PATH}/${PYTHON_SCRIPT}")
endforeach(PYTHON_SCRIPT ${GRPC_PYTHON_SOURCES})
endif(PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "Error installing python code: PYTHON_EXECUTABLE set but ${PYTHON_EXECUTABLE} not found")
endif(EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "PYTHON_EXECUTABLE not specified. Will not install GRPC Python code.")
endif(PYTHON_EXECUTABLE)
endif(RESINSIGHT_ENABLE_GRPC)
#############################################################################

22
ApplicationCode/GrpcInterface/CMakeLists.cmake
View File

@@ -112,7 +112,8 @@ foreach(proto_file ${PROTO_FILES})
DEPENDS "${rips_proto}"
)
if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
if (PYTHON_EXECUTABLE)
if (EXISTS ${PYTHON_EXECUTABLE})
set(rips_proto_python "rips/generated/${proto_file}_pb2.py")
set(rips_grpc_python "rips/generated/${proto_file}_pb2_grpc.py")
@@ -132,8 +133,12 @@ foreach(proto_file ${PROTO_FILES})
${rips_proto_python}
${rips_grpc_python}
)
endif(PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "Error generating Python for ${rips_proto}: PYTHON_EXECUTABLE set but ${PYTHON_EXECUTABLE} not found")
endif(EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "PYTHON_EXECUTABLE not specified. Will not generate GRPC Python code.")
endif(PYTHON_EXECUTABLE)
list( APPEND GRPC_HEADER_FILES
${rips_proto_hdrs}
@@ -147,7 +152,8 @@ foreach(proto_file ${PROTO_FILES})
endforeach(proto_file)
if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
if (PYTHON_EXECUTABLE)
if (EXISTS ${PYTHON_EXECUTABLE})
list(APPEND GRPC_PYTHON_SOURCES
${GRPC_PYTHON_GENERATED_SOURCES}
"rips/generated/RiaVersionInfo.py"
@@ -193,8 +199,12 @@ if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
if (MSVC)
source_group(TREE ${GRPC_PYTHON_SOURCE_PATH} FILES ${GRPC_PYTHON_SOURCES_FULL_PATH} PREFIX "GrpcInterface\\Python")
endif(MSVC)
endif(PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "Error copying GRPC Python Code to build folder: PYTHON_EXECUTABLE set but ${PYTHON_EXECUTABLE} not found")
endif(EXISTS ${PYTHON_EXECUTABLE})
else()
message(STATUS "PYTHON_EXECUTABLE not specified. Will not copy grpc Python code to build folder")
endif(PYTHON_EXECUTABLE)
list ( APPEND GRPC_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
list ( APPEND GRPC_CPP_SOURCES ${SOURCE_GROUP_SOURCE_FILES})