Commit e4ddb1e8 authored by Nick Laurenson's avatar Nick Laurenson
Browse files

Rename VeloView -> LidarView

parent 56c7c1b4
cmake_minimum_required(VERSION 2.8.8)
project(VeloViewSuperBuild)
project(LidarViewSuperBuild)
set (SuperBuild_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
set (SuperBuild_PROJECTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Projects")
set (SuperBuild_BINARY_DIR ${VeloViewSuperBuild_BINARY_DIR}) # required to do FindPackage(ParaView) inside Veloview's CMakeLists
set (SuperBuild_BINARY_DIR ${LidarViewSuperBuild_BINARY_DIR}) # required to do FindPackage(ParaView) inside LidarView's CMakeLists
set(qt_version 5)
......@@ -79,7 +79,7 @@ function (superbuild_find_projects var)
python
pythonqt
qt5
veloview
lidarview
zlib
ceres
glog
......@@ -150,10 +150,10 @@ function (superbuild_add_packaging)
package_suffix
)
set(default_package veloview)
set(default_package lidarview)
foreach (generator IN LISTS generators)
superbuild_add_extra_package_test(veloview "${generator}"
LABELS "VeloView" # does not have to be ${SOFTWARE_NAME} I think
superbuild_add_extra_package_test(lidarview "${generator}"
LABELS "LidarView" # does not have to be ${SOFTWARE_NAME} I think
TIMEOUT 6400)
endforeach ()
......
......@@ -39,7 +39,7 @@ on run argv
set statusbar visible to false
set toolbar visible to false
set the bounds to { 400, 100, 900, 465 }
set position of item "@veloview_appname@" to { 133, 200 }
set position of item "@lidarview_appname@" to { 133, 200 }
set position of item "Applications" to { 378, 200 }
end tell
update without registering applications
......
......@@ -7,35 +7,35 @@
# then try with: ctest -R cpack -V > package.log (very useful to grep the log)
# - to test if the application has correct paths and patched executable/libraries:
# inside build directory:
# `open _CPack_Packages/Darwin/DragNDrop/VeloView-3.6.0-196-g3490e1d-20190109-Darwin-64bit/veloview.app`
# `open _CPack_Packages/Darwin/DragNDrop/LidarView-3.6.0-196-g3490e1d-20190109-Darwin-64bit/lidarview.app`
# (much, much faster than having to mount the .dmg using the finder)
# - testing the .dmg on another computer (that does not have Qt) is important because that is our target
# - testing the .dmg on another computer + executing VeloView from terminal
# (with `/Volume/something.dmg/veloview.app/Contents/MacOS/VeloView`) will sometime give you much
# - testing the .dmg on another computer + executing LidarView from terminal
# (with `/Volume/something.dmg/lidarview.app/Contents/MacOS/LidarView`) will sometime give you much
# very clear indications about absolute path that have not been fixed / missing files
# - to have a hint at "should this file really by inside the .dmg ?", look inside Paraview's .dmg
# or (better) recent working VeloView's .dmg
# or (better) recent working LidarView's .dmg
# - do not hesistate to hack inside ../common-superbuild/cmake/scripts/fixup_bundle.apple.py
# to print/modify/add paths, then get rid of your hack using only this file
# (we do not want to modify the common-superbuild)
include(veloview.bundle.common)
include(${VeloViewSuperBuild_SOURCE_DIR}/../SoftwareInformation/branding.cmake)
include(lidarview.bundle.common)
include(${LidarViewSuperBuild_SOURCE_DIR}/../SoftwareInformation/branding.cmake)
# the variable veloview_appname:
# the variable lidarview_appname:
# - must be a valid dirname: will be a directory at the top of the .dmg
# - is visible in the macOS GUI when opening the .dmg
# - MUST end with .app (else its tree is not considered as an app by macOS)
set(veloview_appname "${SOFTWARE_NAME}.app")
set(veloview_executables "${SOFTWARE_NAME}")
set(lidarview_appname "${SOFTWARE_NAME}.app")
set(lidarview_executables "${SOFTWARE_NAME}")
# VeloView is based on ParaView and can load ParaView plugins
set(paraview_plugin_path "bin/${veloview_appname}/Contents/Plugins")
# LidarView is based on ParaView and can load ParaView plugins
set(paraview_plugin_path "bin/${lidarview_appname}/Contents/Plugins")
# this must be done before calling superbuild_apple_create_app,
# because superbuild_apple_create_app uses paraview_plugin_paths
# this was copied from ParaView's superbuild
# TODO: could/should be inside veloview.bundle.common ?
# TODO: could/should be inside lidarview.bundle.common ?
set(paraview_plugins "PointCloudPlugin" "EyeDomeLightingView")
set(paraview_plugin_paths)
foreach (paraview_plugin IN LISTS paraview_plugins)
......@@ -57,11 +57,11 @@ endforeach ()
superbuild_apple_create_app(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${superbuild_install_location}/bin/${veloview_appname}/Contents/MacOS/${SOFTWARE_NAME}"
"${lidarview_appname}"
"${superbuild_install_location}/bin/${lidarview_appname}/Contents/MacOS/${SOFTWARE_NAME}"
CLEAN
PLUGINS ${paraview_plugin_paths}
SEARCH_DIRECTORIES "${superbuild_install_location}/lib" "${superbuild_install_location}/bin/${veloview_appname}/Contents/Libraries"
SEARCH_DIRECTORIES "${superbuild_install_location}/lib" "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries"
INCLUDE_REGEXES ${include_regexes})
......@@ -77,33 +77,33 @@ function (paraview_add_plugin output)
endforeach ()
file(WRITE "${output}" "${contents}")
endfunction ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/veloview.plugins")
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/lidarview.plugins")
paraview_add_plugin("${plugins_file}" ${paraview_plugins})
install(
FILES "${plugins_file}"
DESTINATION "${veloview_appname}/Contents/Plugins"
DESTINATION "${lidarview_appname}/Contents/Plugins"
COMPONENT superbuild
RENAME ".plugins")
install(
FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Resources/pvIcon.icns"
DESTINATION "${veloview_appname}/Contents/Resources"
DESTINATION "${lidarview_appname}/Contents/Resources"
COMPONENT superbuild)
install(
FILES "${superbuild_install_location}/bin/${veloview_appname}/Contents/Info.plist"
DESTINATION "${veloview_appname}/Contents"
FILES "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Info.plist"
DESTINATION "${lidarview_appname}/Contents"
COMPONENT superbuild)
# Remove "VeloView" from the list since we just installed it above.
list(REMOVE_ITEM veloview_executables
# Remove "LidarView" from the list since we just installed it above.
list(REMOVE_ITEM lidarview_executables
${SOFTWARE_NAME})
foreach (executable IN LISTS veloview_executables)
foreach (executable IN LISTS lidarview_executables)
superbuild_apple_install_utility(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${superbuild_install_location}/bin/${veloview_appname}/Contents/bin/${executable}"
"${lidarview_appname}"
"${superbuild_install_location}/bin/${lidarview_appname}/Contents/bin/${executable}"
SEARCH_DIRECTORIES "${superbuild_install_location}/lib"
INCLUDE_REGEXES ${include_regexes})
endforeach ()
......@@ -112,30 +112,30 @@ if (qt5_enabled)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = Plugins\n")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
DESTINATION "${veloview_appname}/Contents/Resources"
DESTINATION "${lidarview_appname}/Contents/Resources"
COMPONENT superbuild)
endif ()
if (python_enabled)
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${lidarview_appname}"
MODULES paraview
veloview
lidarview
vtk
vtkmodules
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/${veloview_appname}/Contents/Python"
"${superbuild_install_location}/bin/${lidarview_appname}/Contents/Python"
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES
"${superbuild_install_location}/bin/${veloview_appname}/Contents/Libraries"
"${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries"
"${superbuild_install_location}/lib")
if (matplotlib_enabled)
install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/"
DESTINATION "${veloview_appname}/Contents/Python/matplotlib/mpl-data"
DESTINATION "${lidarview_appname}/Contents/Python/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
endif ()
......@@ -145,26 +145,26 @@ endif ()
# it could be that I failed to find the correct name(s) to add in parameter
# "MODULE" but I do not think so because there are 86 such files, and because
# they seem to be part of vtk which is already specified like that in ParaView
file(GLOB missing_python_so "${superbuild_install_location}/bin/${veloview_appname}/Contents/Libraries/vtk*Python.so")
file(GLOB missing_python_so "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries/vtk*Python.so")
foreach (python_so ${missing_python_so})
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${lidarview_appname}"
"${python_so}"
"Contents/Libraries") # destination path inside bundle
endforeach()
# My understanding is that these module are not processed automatically
# by superbuild_apple_create_app because there is no path leading to
# them in binary VeloView or in any of its .dylib dependencies
# them in binary LidarView or in any of its .dylib dependencies
set(my_modules)
list(APPEND my_modules "LidarPluginPython.so")
list(APPEND my_modules "libLidarPluginPythonD.dylib")
foreach (module ${my_modules})
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${superbuild_install_location}/bin/${veloview_appname}/Contents/Libraries/${module}"
"${lidarview_appname}"
"${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries/${module}"
"Contents/Libraries") # destination path inside bundle
endforeach()
......@@ -184,13 +184,13 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}"
"${veloview_appname}"
"${lidarview_appname}"
"${qt5_plugin_path}"
"Contents/Plugins/${qt5_plugin_group}"
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
install(DIRECTORY "${superbuild_install_location}/bin/${veloview_appname}/Contents/Resources"
DESTINATION "${veloview_appname}/Contents"
install(DIRECTORY "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Resources"
DESTINATION "${lidarview_appname}/Contents"
COMPONENT superbuild)
# Enable CPack packaging.
set(VeloViewSuperBuild_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../")
include(${VeloViewSuperBuild_SOURCE_DIR}/../SoftwareInformation/branding.cmake)
set(LidarViewSuperBuild_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../")
include(${LidarViewSuperBuild_SOURCE_DIR}/../SoftwareInformation/branding.cmake)
# Include CMake scripts for geting the version from Git
include(Git)
include(ParaViewDetermineVersion)
# Sets VV_VERSION_{MAJOR,MINOR,PATCH} for git
set(VV_VERSION_FILE ${VeloViewSuperBuild_SOURCE_DIR}/../version.txt)
set(VV_VERSION_FILE ${LidarViewSuperBuild_SOURCE_DIR}/../version.txt)
file(STRINGS "${VV_VERSION_FILE}" version_txt)
extract_version_components("${version_txt}" "VV")
determine_version(${VeloViewSuperBuild_SOURCE_DIR} ${GIT_EXECUTABLE} "VV")
determine_version(${LidarViewSuperBuild_SOURCE_DIR} ${GIT_EXECUTABLE} "VV")
# Update the hard-coded version
extract_version_components("${version_txt}" "VV_file")
if((version_txt VERSION_LESS VV_VERSION_FULL)
......@@ -23,11 +23,11 @@ if(NOT (version_txt STREQUAL VV_VERSION_FULL))
endif()
# Sets GD_YEAR, GD_MONTH, GD_DAY
include(${VeloViewSuperBuild_SOURCE_DIR}/Projects/getdate.cmake)
include(${LidarViewSuperBuild_SOURCE_DIR}/Projects/getdate.cmake)
GET_DATE()
set(PACKAGE_TIMESTAMP "${GD_YEAR}${GD_MONTH}${GD_DAY}")
set(CPACK_COMPONENT_VELOVIEW_DISPLAY_NAME ${SOFTWARE_NAME})
set(CPACK_COMPONENT_LIDARVIEW_DISPLAY_NAME ${SOFTWARE_NAME})
set(CPACK_PACKAGE_VERSION_MAJOR ${VV_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VV_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VV_VERSION_PATCH})
......@@ -46,9 +46,9 @@ endif()
message(STATUS "Bundled package name will be: ${CPACK_PACKAGE_FILE_NAME}" )
# Set the license file.
set(CPACK_RESOURCE_FILE_LICENSE "${VeloViewSuperBuild_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${LidarViewSuperBuild_SOURCE_DIR}/LICENSE")
set(veloview_executables
set(lidarview_executables
${SOFTWARE_NAME})
......
superbuild_add_project(veloview
superbuild_add_project(lidarview
DEPENDS paraview qt5 pcap boost eigen liblas
DEFAULT_ON
CMAKE_ARGS
......
# include(paraview-version)
include(veloview.bundle.common)
include(lidarview.bundle.common)
set(veloview_component "${SOFTWARE_NAME}")
include(veloview.bundle.unix)
set(lidarview_component "${SOFTWARE_NAME}")
include(lidarview.bundle.unix)
install(DIRECTORY "${superbuild_install_location}/lib/paraview-${PARAVIEW_VERSION}"
DESTINATION "lib"
......@@ -11,7 +11,7 @@ install(DIRECTORY "${superbuild_install_location}/lib/paraview-${PARAVIEW_VERSIO
COMPONENT superbuild)
# install all libraries
install(DIRECTORY "${superbuild_install_location}/lib/veloview-${VV_VERSION}"
install(DIRECTORY "${superbuild_install_location}/lib/lidarview-${VV_VERSION}"
DESTINATION "lib"
USE_SOURCE_PERMISSIONS
COMPONENT superbuild)
......@@ -41,17 +41,17 @@ install(DIRECTORY
# FIXME: we can reconfigure Qt to be built with inbuilt sqllite support to
# avoid the need for plugins.
"${superbuild_install_location}/plugins/"
DESTINATION "lib/veloview-${VV_VERSION}"
DESTINATION "lib/lidarview-${VV_VERSION}"
COMPONENT superbuild
PATTERN "*.a" EXCLUDE
PATTERN "veloview-${VV_VERSION}" EXCLUDE
PATTERN "lidarview-${VV_VERSION}" EXCLUDE
PATTERN "fontconfig" EXCLUDE
PATTERN "*.jar" EXCLUDE
PATTERN "*.debug.*" EXCLUDE
PATTERN "libboost*" EXCLUDE)
install(FILES ${lib_files_so}
DESTINATION "lib/veloview-${VV_VERSION}"
DESTINATION "lib/lidarview-${VV_VERSION}"
COMPONENT superbuild)
unset(lib_files_so)
......@@ -9,7 +9,7 @@ endif ()
set(include_regexes)
set(exclude_regexes)
foreach (executable IN LISTS veloview_executables)
foreach (executable IN LISTS lidarview_executables)
superbuild_unix_install_program_fwd("${executable}"
"bin"
SEARCH_DIRECTORIES "${library_paths}"
......@@ -18,7 +18,7 @@ foreach (executable IN LISTS veloview_executables)
endforeach ()
# this was present in ParaView's paraview.bundle.unix.cmake,
# delete when it is certain that this is not needed for VeloView:
# delete when it is certain that this is not needed for LidarView:
if (python_enabled)
include(python.functions)
superbuild_install_superbuild_python(
......@@ -52,7 +52,7 @@ if (qt5_enabled)
endif ()
# this was present in ParaView's paraview.bundle.unix.cmake,
# delete when it is certain that this is not needed for VeloView:
# delete when it is certain that this is not needed for LidarView:
message(STATUS "TOP: qt5_plugin_paths is: ${qt5_plugin_path}")
# foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
# get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
......
include(veloview.bundle.common)
include(lidarview.bundle.common)
# Set NSIS install specific stuff.
if (CMAKE_CL_64)
......@@ -6,8 +6,8 @@ if (CMAKE_CL_64)
set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
endif ()
set(CPACK_NSIS_HELP_LINK "https://www.paraview.org/veloview/")
set(${SOFTWARE_NAME}_description "${SOFTWARE_NAME} ${veloview_version_full}")
set(CPACK_NSIS_HELP_LINK "https://www.paraview.org/lidarview/")
set(${SOFTWARE_NAME}_description "${SOFTWARE_NAME} ${lidarview_version_full}")
set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_LIST_DIR}/../../../SoftwareInformation/logo.ico")
......@@ -18,8 +18,8 @@ if (Qt5_DIR)
"${Qt5_DIR}/../../../bin")
endif ()
# Install veloview executables to bin.
foreach (executable IN LISTS veloview_executables)
# Install lidarview executables to bin.
foreach (executable IN LISTS lidarview_executables)
if (DEFINED "${executable}_description")
list(APPEND CPACK_NSIS_MENU_LINKS
"bin/${executable}.exe" "${${executable}_description}")
......
......@@ -15,9 +15,9 @@ superbuild_set_revision(pythonqt
set(PARAVIEW_VERSION 5.4)
superbuild_set_revision(paraview
GIT_REPOSITORY https://gitlab.kitware.com/bjacquet/paraview.git
GIT_TAG origin/5.4CustomForVeloview-withPointCloudRepPlugin)
GIT_TAG origin/5.4CustomForLidarView)
superbuild_set_revision(veloview
superbuild_set_revision(lidarview
SOURCE_DIR ${CMAKE_SOURCE_DIR}/..
DOWNLOAD_COMMAND "")
......
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