Commit cfc03eb5 authored by Ben Boeckel's avatar Ben Boeckel

cmake: use VTK_MODULE_HEADER_DIR

parent 2a85a88d
Pipeline #74484 failed with stage
# File defining miscellaneous macros
if(NOT VTK_MODULE_HEADER_DIR)
set(VTK_MODULE_HEADER_DIR "${CMAKE_BINARY_DIR}/CMakeFiles/vtk_module_headers")
endif()
#------------------------------------------------------------------------------
# GENERATE_QT_RESOURCE_FROM_FILES can be used to generate a Qt resource file
# from a given set of files.
......
......@@ -65,7 +65,7 @@ MACRO(ENCODE_FILES_AS_STRINGS OUT_SRCS)
GET_FILENAME_COMPONENT(file "${file}" ABSOLUTE)
GET_FILENAME_COMPONENT(file_name "${file}" NAME_WE)
set(src ${file})
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file_name}.cxx)
set(res ${VTK_MODULE_HEADER_DIR}/${file_name}.cxx)
add_custom_command(
OUTPUT ${res}
DEPENDS ${src} vtkEncodeString
......@@ -367,20 +367,20 @@ macro(add_pqproxy OUTIFACES OUTSRCS)
list(GET arg_types 0 ARG_TYPE)
set (IMP_CLASS "${ARG_TYPE}ServerManagerModelImplementation")
configure_file(${ParaView_CMAKE_DIR}/pqServerManagerModelImplementation.h.in
${CMAKE_CURRENT_BINARY_DIR}/${IMP_CLASS}.h @ONLY)
${VTK_MODULE_HEADER_DIR}/${IMP_CLASS}.h @ONLY)
configure_file(${ParaView_CMAKE_DIR}/pqServerManagerModelImplementation.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${IMP_CLASS}.cxx @ONLY)
${VTK_MODULE_HEADER_DIR}/${IMP_CLASS}.cxx @ONLY)
set (_moc_srcs)
QT5_WRAP_CPP(_moc_srcs ${CMAKE_CURRENT_BINARY_DIR}/${IMP_CLASS}.h)
QT5_WRAP_CPP(_moc_srcs ${VTK_MODULE_HEADER_DIR}/${IMP_CLASS}.h)
set(${OUTIFACES} ${${OUTIFACES}} ${ARG_TYPE}ServerManagerModel) # don't add
# the extra "Implementation" here.
set(${OUTSRCS}
${${OUTSRCS}}
${_moc_srcs}
${CMAKE_CURRENT_BINARY_DIR}/${IMP_CLASS}.h
${CMAKE_CURRENT_BINARY_DIR}/${IMP_CLASS}.cxx
${VTK_MODULE_HEADER_DIR}/${IMP_CLASS}.h
${VTK_MODULE_HEADER_DIR}/${IMP_CLASS}.cxx
)
endif()
......
......@@ -76,10 +76,10 @@ function(pv_add_executable_with_forwarding2
set(PV_FORWARD_EXE ${exe_name})
configure_file(
${ParaView_CMAKE_DIR}/pv-forward.c.in
${CMAKE_CURRENT_BINARY_DIR}/${exe_name}-forward.c
${VTK_MODULE_HEADER_DIR}/${exe_name}-forward.c
@ONLY)
add_executable(${exe_name}${PV_EXE_SUFFIX}
${CMAKE_CURRENT_BINARY_DIR}/${exe_name}-forward.c)
${VTK_MODULE_HEADER_DIR}/${exe_name}-forward.c)
set_target_properties(${exe_name}${PV_EXE_SUFFIX} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/launcher)
set_target_properties(${exe_name}${PV_EXE_SUFFIX} PROPERTIES
......
......@@ -594,6 +594,8 @@ else()
endif()
set(VTK_MODULE_HEADER_DIR "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/vtk_module_headers")
#----------------------------------------------------------------------------------
# Import all essential CMake files. Based on whether we are using internal or
# external VTK, these modules will be imported for the appropropriate locations.
......
......@@ -9,7 +9,7 @@ endforeach ()
#-----------------------------------------------------------------------------
# Stuff for ObjectFactory override for vtkSMParaViewPipelineControllerWithRendering.
list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(${vtk-module}ObjectFactory WRAP_EXCLUDE)
......@@ -35,26 +35,26 @@ endforeach()
# Now lets create the object factory classes
string(TOUPPER ${vtk-module} VTK-MODULE)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.h)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.h)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Compile ColorMaps.json
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
OUTPUT ${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ColorMaps.json
kwProcessXML
COMMAND kwProcessXML
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
vtkSMTransferFunctionPresets JSON JSON
${CMAKE_CURRENT_SOURCE_DIR}/ColorMaps.json
COMMENT "Processing builtin color maps")
set(${vtk-module}_HDRS
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
HEADER_FILE_ONLY
WRAP_EXCLUDE)
#-----------------------------------------------------------------------------
......
......@@ -2,8 +2,8 @@
foreach (file vtkIceTCompositeZPassShader_fs.glsl)
get_filename_component(file_we ${file} NAME_WE)
set(src ${CMAKE_CURRENT_SOURCE_DIR}/${file})
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.cxx)
set(resh ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.h)
set(res ${VTK_MODULE_HEADER_DIR}/${file_we}.cxx)
set(resh ${VTK_MODULE_HEADER_DIR}/${file_we}.h)
list(APPEND shader_h_files ${resh})
add_custom_command(
OUTPUT ${res} ${resh}
......@@ -13,5 +13,5 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVVTKExtensionsRenderingModule.h
)
list(APPEND Module_SRCS ${res})
set_source_files_properties(${file_we} WRAP_EXCLUDE)
set_source_files_properties(${res} WRAP_EXCLUDE)
endforeach()
......@@ -27,16 +27,16 @@ endforeach()
# Now lets create the object factory classes
string(TOUPPER ${vtk-module} VTK-MODULE)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.h)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.h)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(
${vtk-module}ObjectFactory.cxx
WRAP_EXCLUDE
)
list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx
)
vtk_module_library(vtkInteractionStyle ${Module_SRCS})
......@@ -27,12 +27,12 @@ endforeach()
# Now let's create the object factory classes
string(TOUPPER ${vtk-module} VTK-MODULE)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.h)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.h)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx
)
set_source_files_properties(
......
......@@ -12,8 +12,8 @@ unset(shader_h_files)
foreach(file ${shader_files})
get_filename_component(file_we ${file} NAME_WE)
set(src ${CMAKE_CURRENT_SOURCE_DIR}/${file})
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.cxx)
set(resh ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.h)
set(res ${VTK_MODULE_HEADER_DIR}/${file_we}.cxx)
set(resh ${VTK_MODULE_HEADER_DIR}/${file_we}.h)
list(APPEND shader_h_files ${resh})
add_custom_command(
OUTPUT ${res} ${resh}
......@@ -23,7 +23,7 @@ foreach(file ${shader_files})
--build-header VTKRENDERINGPARALLEL_EXPORT vtkRenderingParallelModule.h
)
list(APPEND Module_SRCS ${res})
set_source_files_properties(${file_we}
set_source_files_properties(${res}
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
......
......@@ -51,11 +51,12 @@ set_source_files_properties(
set (${vtk-module}_HDRS CAdaptorAPI.h)
configure_file(vtkCPConfig.h.in
vtkCPConfig.h @ONLY)
${VTK_MODULE_HEADER_DIR}/vtkCPConfig.h @ONLY)
set (CATALYST_FORTRAN_USING_MANGLING)
if (CMAKE_Fortran_COMPILER_WORKS)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
include(FortranCInterface)
FortranCInterface_HEADER(FortranAdaptorAPIMangling.h
SYMBOLS
......
......@@ -42,6 +42,7 @@ set (${vtk-module}_HDRS CPythonAdaptorAPI.h)
set (CATALYST_FORTRAN_USING_MANGLING)
if (CMAKE_Fortran_COMPILER_WORKS)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
include(FortranCInterface)
FortranCInterface_HEADER(FortranPythonAdaptorAPIMangling.h
SYMBOLS coprocessorinitializewithpython coprocessoraddpythonscript)
......
......@@ -78,7 +78,7 @@ set_source_files_properties(
# Add header-only files so they get installed correctly.
set (${vtk-module}_HDRS
${CMAKE_CURRENT_SOURCE_DIR}/vtkSMMessageMinimal.h
${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
${VTK_MODULE_HEADER_DIR}/vtkPVMessage.pb.h
${CMAKE_CURRENT_SOURCE_DIR}/vtkSIVectorPropertyTemplate.h
)
......@@ -86,22 +86,22 @@ set (${vtk-module}_HDRS
# Generate the protbuf message file.
#------------------------------------------------------------------------------
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
OUTPUT ${VTK_MODULE_HEADER_DIR}/vtkPVMessage.pb.h
${VTK_MODULE_HEADER_DIR}/vtkPVMessage.pb.cc
COMMAND protoc_compiler
"--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
"--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${VTK_MODULE_HEADER_DIR}"
--proto_path "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${VTK_MODULE_HEADER_DIR}
)
add_custom_target(
protobuf_code_generation
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
${VTK_MODULE_HEADER_DIR}/vtkPVMessage.pb.h
${VTK_MODULE_HEADER_DIR}/vtkPVMessage.pb.cc
)
#------------------------------------------------------------------------------
......
......@@ -84,7 +84,7 @@ endif()
# Stuff for ObjectFactory override for vtkSMParaViewPipelineControllerWithRendering.
list(APPEND Module_SRCS
vtkSMParaViewPipelineControllerWithRendering.cxx
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(${vtk-module}ObjectFactory WRAP_EXCLUDE)
......@@ -110,26 +110,26 @@ endforeach()
# Now lets create the object factory classes
string(TOUPPER ${vtk-module} VTK-MODULE)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.h)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.h)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
${VTK_MODULE_HEADER_DIR}/${vtk-module}ObjectFactory.cxx)
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Compile ColorMaps.json
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
OUTPUT ${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ColorMaps.json
kwProcessXML
COMMAND kwProcessXML
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
vtkSMTransferFunctionPresets JSON JSON
${CMAKE_CURRENT_SOURCE_DIR}/ColorMaps.json
COMMENT "Processing builtin color maps")
set(${vtk-module}_HDRS
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
${VTK_MODULE_HEADER_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
HEADER_FILE_ONLY
WRAP_EXCLUDE)
#-----------------------------------------------------------------------------
......
......@@ -163,16 +163,16 @@ set (PARAVIEW_SERVERMANAGER_XMLS ${resourceFiles}
CACHE INTERNAL "Server Manager XMLs")
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkSMGeneratedModules.h
OUTPUT ${VTK_MODULE_HEADER_DIR}/vtkSMGeneratedModules.h
DEPENDS ${resourceFiles} kwProcessXML
COMMAND kwProcessXML
${CMAKE_CURRENT_BINARY_DIR}/vtkSMGeneratedModules.h
${VTK_MODULE_HEADER_DIR}/vtkSMGeneratedModules.h
vtkSMDefaultModules Interface GetInterfaces
${resourceFiles}
COMMENT "Generating headers for ServerManager XMLs")
set_source_files_properties(vtkInitializationHelper.cxx
PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/vtkSMGeneratedModules.h)
${VTK_MODULE_HEADER_DIR}/vtkSMGeneratedModules.h)
set (xml_init_code "")
......@@ -189,6 +189,6 @@ endforeach()
#------------------------------------------------------------------------------
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/vtkPVInitializer.h.in
${CMAKE_CURRENT_BINARY_DIR}/vtkPVInitializer.h
${VTK_MODULE_HEADER_DIR}/vtkPVInitializer.h
@ONLY)
#------------------------------------------------------------------------------
......@@ -131,8 +131,8 @@ set_source_files_properties(
foreach (file vtkIceTCompositeZPassShader_fs.glsl)
get_filename_component(file_we ${file} NAME_WE)
set(src ${CMAKE_CURRENT_SOURCE_DIR}/${file})
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.cxx)
set(resh ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.h)
set(res ${VTK_MODULE_HEADER_DIR}/${file_we}.cxx)
set(resh ${VTK_MODULE_HEADER_DIR}/${file_we}.h)
list(APPEND shader_h_files ${resh})
add_custom_command(
OUTPUT ${res} ${resh}
......@@ -142,7 +142,7 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVVTKExtensionsRenderingModule.h
)
list(APPEND Module_SRCS ${res})
set_source_files_properties(${file_we} WRAP_EXCLUDE)
set_source_files_properties(${res} WRAP_EXCLUDE)
endforeach()
#---------------------------------------------------------
......
......@@ -23,7 +23,7 @@ set(GLSL_SRCS
set (${vtk-module}_HDRS)
foreach(file ${GLSL_SRCS})
set(src ${CMAKE_CURRENT_SOURCE_DIR}/${GLSL_RESOURCES_DIR}/${file}.glsl)
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file}.cxx)
set(res ${VTK_MODULE_HEADER_DIR}/${file}.cxx)
add_custom_command(
OUTPUT ${res}
DEPENDS ${src} vtkEncodeString
......
......@@ -10,7 +10,7 @@ add_subdirectory( FmmMesh )
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/FmmMesh
${CMAKE_CURRENT_BINARY_DIR}/FmmMesh
${VTK_MODULE_HEADER_DIR}
${VTK_INCLUDE_DIRS}
)
......
......@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 11)
set( VTKFMMMESH_BUILD_SHARED_LIBS OFF )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkFmmMeshConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/vtkFmmMeshConfig.h)
${VTK_MODULE_HEADER_DIR}/vtkFmmMeshConfig.h)
set( ${PROJECT_NAME}_SRCS
gw_core/GW_Config.cpp
......@@ -47,7 +47,7 @@ set( ${PROJECT_NAME}_HDRS
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/gw_core
${CMAKE_CURRENT_SOURCE_DIR}/gw_geodesic
${CMAKE_CURRENT_BINARY_DIR} )
${VTK_MODULE_HEADER_DIR} )
add_library( ${PROJECT_NAME} STATIC
${${PROJECT_NAME}_SRCS}
......
include_directories(${VTK_INCLUDE_DIRS})
include_directories(
${VTK_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR})
if (PARAVIEW_BUILD_QT_GUI)
pv_find_package_qt(qt_targets REQUIRED QUIET
......
......@@ -51,10 +51,10 @@ ADD_PARAVIEW_AUTO_START(
CLASS_NAME pqTPPluginManager)
ADD_CUSTOM_COMMAND(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/tp_export_py.cxx"
OUTPUT "${VTK_MODULE_HEADER_DIR}/tp_export_py.cxx"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/tp_export.py"
COMMAND vtkEncodeString
ARGS "${CMAKE_CURRENT_BINARY_DIR}/tp_export_py.cxx"
ARGS "${VTK_MODULE_HEADER_DIR}/tp_export_py.cxx"
"${CMAKE_CURRENT_SOURCE_DIR}/tp_export.py"
tp_export_py)
......@@ -71,7 +71,7 @@ ADD_PARAVIEW_PLUGIN(
${UI_RESOURCES}
${PARAVIEW_PLUGIN_SRCS}
${PARAVIEW_PLUGIN_SRCS2}
tp_export_py.cxx
${VTK_MODULE_HEADER_DIR}/tp_export_py.cxx
)
TARGET_LINK_LIBRARIES(TemporalParallelismScriptGenerator LINK_PRIVATE ${qt_targets})
......
......@@ -550,6 +550,8 @@ set (Module_RESOURCE_FILES
)
include(ParaViewQt)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
if (PARAVIEW_USE_QTHELP)
pv_find_package_qt(qt_private_targets REQUIRED QUIET
QT5_COMPONENTS Widgets Help)
......
......@@ -573,6 +573,9 @@ SOURCE_GROUP("Generated" FILES
${__Module_UI_SRCS}
)
list(APPEND ${vtk-module}_INCLUDE_DIRS
"${CMAKE_CURRENT_BINARY_DIR}")
set(${vtk-module}_NO_HeaderTest 1)
vtk_module_library(${vtk-module}
${Module_SRCS}
......
......@@ -324,6 +324,8 @@ endif()
#-------------------------------------------------------------------------
include(ParaViewQt)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
if (PARAVIEW_USE_QTHELP)
pv_find_package_qt(qt_private_targets REQUIRED QUIET
QT5_COMPONENTS Help)
......
......@@ -68,6 +68,7 @@ include_directories(
"${VTK_SOURCE_DIR}/Wrapping/Python"
"${VTK_BINARY_DIR}/Wrapping/Python"
${PYTHON_INCLUDE_DIRS}
"${CMAKE_CURRENT_BINARY_DIR}"
)
#-------------------------------------------------------------------------
......
......@@ -187,6 +187,7 @@ set (QtWidgets_SRCS
)
include(ParaViewQt)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
set(qt5_public_comps Core Gui Widgets)
set(qt5_private_comps Network)
......
......@@ -38,7 +38,7 @@ set (${vtk-module}_HDRS
${CMAKE_CURRENT_SOURCE_DIR}/BHTree.h
${CMAKE_CURRENT_SOURCE_DIR}/BasicDefinition.h
${CMAKE_CURRENT_SOURCE_DIR}/CosmoToolsDefinitions.h
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}Module.h
${VTK_MODULE_HEADER_DIR}/${vtk-module}Module.h
)
include_directories(
......
......@@ -19,15 +19,15 @@ set (dependencies)
# when building static ParaView, generate a header file to initialize
# all the python wrapped modules statically.
vtk_write_python_modules_header_for_wrapped_modules(
"${CMAKE_CURRENT_BINARY_DIR}/pvpythonmodules.h"
"${VTK_MODULE_HEADER_DIR}/pvpythonmodules.h"
dependencies)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${VTK_MODULE_HEADER_DIR})
set (Module_SRCS vtkPVPythonInitializer.cxx)
if (PARAVIEW_FREEZE_PYTHON)
set (FreezePython_SRC_DIR "${ParaView_SOURCE_DIR}/ThirdParty/FreezePython")
set (output_dir "${CMAKE_CURRENT_BINARY_DIR}/FrozenPython")
set (output_dir "${VTK_MODULE_HEADER_DIR}/FrozenPython")
add_custom_command(
OUTPUT "${output_dir}/vtkFrozenParaViewPython.h"
......@@ -38,7 +38,7 @@ if (PARAVIEW_FREEZE_PYTHON)
-DOUTPUT_HEADER_PREFIX:STRING="vtkFrozenParaViewPython"
-P "${FreezePython_SRC_DIR}/vtkFreezePython.cmake"
DEPENDS "${FreezePython_SRC_DIR}/vtkFreezePython.cmake"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
WORKING_DIRECTORY "${VTK_MODULE_HEADER_DIR}"
COMMENT "Freezing Python and ParaView Python packages and modules")
include_directories("${output_dir}")
......
......@@ -47,7 +47,7 @@ MARK_AS_ADVANCED(PV_TEST_CLIENT)
# Add the test driver executable. This is not done in the above loop to avoid
# adding dependencies ${LIBS} since we only need vtksys for this executable.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkSMTestDriverConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTestDriverConfig.h @ONLY ESCAPE_QUOTES)
${VTK_MODULE_HEADER_DIR}/vtkSMTestDriverConfig.h @ONLY ESCAPE_QUOTES)
include(vtkForwardingExecutable)
......
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