Commit f3bfaeff authored by David Partyka's avatar David Partyka Committed by Kitware Robot

Merge topic '0012667-fix-cross-compilation-regression'

b68897eb Attempt two at fixing windows compilation.
db32810d fix windows compilation
05e79699 Fix ParaView cross compilation
f2909654 Fix ParaView cross compilation.
parents 27b97cdc b68897eb
......@@ -20,6 +20,6 @@ else(WIN32)
endif(WIN32)
execute_process(
COMMAND "@EXECUTABLE_OUTPUT_PATH@/${OutDir}/protoc" "--cpp_out=dllexport_decl=VTK_PROTOBUF_EXPORT:@CMAKE_CURRENT_BINARY_DIR@" --proto_path "@CMAKE_CURRENT_SOURCE_DIR@/Resources" "@CMAKE_CURRENT_SOURCE_DIR@/Resources/vtkPVMessage.proto"
COMMAND "@PROTOC_LOCATION@" "--cpp_out=dllexport_decl=VTK_PROTOBUF_EXPORT:@CMAKE_CURRENT_BINARY_DIR@" --proto_path "@CMAKE_CURRENT_SOURCE_DIR@/Resources" "@CMAKE_CURRENT_SOURCE_DIR@/Resources/vtkPVMessage.proto"
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
)
)
......@@ -86,7 +86,13 @@ INCLUDE_DIRECTORIES(
#------------------------------------------------------------------------------
# Compile protobuf resources.
# run it from a script so we can set necessary paths.
get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
if (WIN32)
get_filename_component(PROTOC_DIR ${PROTOC_LOCATION} PATH)
get_filename_component(PROTOC_PDIR ${PROTOC_DIR} PATH)
get_filename_component(PROTOC_FNAME ${PROTOC_LOCATION} NAME_WE)
set(PROTOC_LOCATION "${PROTOC_PDIR}/\${OutDir}/${PROTOC_FNAME}")
endif (WIN32)
configure_file(${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/ExecuteProtoC.cmake
@ONLY)
......
protobuf @ 90d147a7
Subproject commit 2260b2f9de318e0d6f95223463b9df7b6ddaa479
Subproject commit 90d147a719801d2745b2337d9377ccc3fe3a0f51
VTK @ 09cd9411
Subproject commit f01a692c7c0749f36fac0bdedc5e41844dcbe242
Subproject commit 09cd941168cb6b27afcf873e2f7ad3c1189b204b
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment