Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mathieu Westphal
ParaView-Superbuild
Commits
1a958f5a
Commit
1a958f5a
authored
Jun 09, 2020
by
Mathieu Westphal
Browse files
Enable PARAVIEW_INSTALL_DEVELOPEMENT_FILES by default
parent
33c513b6
Pipeline
#177615
failed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
projects/paraview.cmake
View file @
1a958f5a
...
...
@@ -14,11 +14,6 @@ if (PV_NIGHTLY_SUFFIX)
-DPV_NIGHTLY_SUFFIX:STRING=
${
PV_NIGHTLY_SUFFIX
}
)
endif
()
set
(
paraview_install_development_files FALSE
)
if
((
UNIX AND NOT APPLE
)
OR paraviewsdk_enabled OR vortexfinder2_enabled
)
set
(
paraview_install_development_files TRUE
)
endif
()
# Without an offscreen rendering backend, X should be used.
set
(
paraview_use_x ON
)
if
(
WIN32 OR APPLE OR osmesa_enabled OR egl_enabled
)
...
...
@@ -148,7 +143,7 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_MOTIONFX:BOOL=
${
PARAVIEW_ENABLE_MOTIONFX
}
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=
${
visitbridge_enabled
}
-DPARAVIEW_ENABLE_XDMF3:BOOL=
${
xdmf3_enabled
}
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=
${
paraview_install_development_files
}
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=
ON
-DPARAVIEW_PLUGIN_ENABLE_OpenVR:BOOL=
${
openvr_enabled
}
# No netcdftime module in the package.
-DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=OFF
...
...
@@ -201,21 +196,6 @@ superbuild_add_project(paraview
${
PARAVIEW_EXTRA_CMAKE_ARGUMENTS
}
)
if
(
paraview_install_development_files
)
find_program
(
SED_EXECUTABLE sed
)
mark_as_advanced
(
SED_EXECUTABLE
)
if
(
SED_EXECUTABLE
)
superbuild_project_add_step
(
"fixup-cmake-paths"
COMMAND
"
${
CMAKE_COMMAND
}
"
-Dinstall_location:PATH=<INSTALL_DIR>
-Dparaview_version:STRING=
${
paraview_version
}
-P
"
${
CMAKE_CURRENT_LIST_DIR
}
/scripts/paraview.fixupcmakepaths.cmake"
COMMENT
"Fixing paths in generated CMake files for packaging."
DEPENDEES install
WORKING_DIRECTORY <INSTALL_DIR>
)
endif
()
endif
()
if
(
paraview_SOURCE_SELECTION STREQUAL
"5.3.0"
)
superbuild_apply_patch
(
paraview fix-benchmarks
"Fix various issues with the shipped benchmark scripts"
)
...
...
projects/scripts/paraview.fixupcmakepaths.cmake
deleted
100644 → 0
View file @
33c513b6
set
(
pv_cmake_dir
"
${
install_location
}
/lib/cmake/paraview-
${
paraview_version
}
"
)
if
(
NOT EXISTS
"
${
pv_cmake_dir
}
"
)
message
(
FATAL_ERROR
"The ParaView CMake directory does not exist:
${
pv_cmake_dir
}
"
)
endif
()
file
(
GLOB cmake_files
"
${
pv_cmake_dir
}
/ParaViewTargets*.cmake"
"
${
pv_cmake_dir
}
/VTKConfig.cmake"
)
if
(
APPLE
)
set
(
sed_cmd_prefix
"sed -i
\"\"
"
)
set
(
sed_cmd_suffix
)
else
()
set
(
sed_cmd_prefix sed
)
set
(
sed_cmd_suffix -i
)
endif
()
foreach
(
cmake_file IN LISTS cmake_files
)
execute_process
(
COMMAND
${
sed_cmd_prefix
}
-e
"s|
${
install_location
}
|
\$
{_IMPORT_PREFIX}|g"
${
sed_cmd_suffix
}
"
${
cmake_file
}
"
RESULT_VARIABLE RES
)
if
(
NOT RES EQUAL 0
)
message
(
FATAL_ERROR
"Failed to patch
${
cmake_file
}
"
)
endif
()
endforeach
()
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment