Commit b40ae587 authored by Pat Marion's avatar Pat Marion
Browse files

Update cmake scripts to replace VelodyneViewer with VeloView

parent cd21adc7
......@@ -7,10 +7,10 @@ if (APPLE)
endif()
endif()
project(VelodyneViewerSuperBuild)
project(VeloViewSuperBuild)
set (SuperBuild_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
set (SuperBuild_PROJECTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Projects")
set (SuperBuild_BINARY_DIR ${VelodyneViewerSuperBuild_BINARY_DIR})
set (SuperBuild_BINARY_DIR ${VeloViewSuperBuild_BINARY_DIR})
include(CMakeDependentOption)
......@@ -95,7 +95,7 @@ string (STRIP "${cxxflags}" cxxflags)
string (STRIP "${cflags}" cflags)
#-----------------------------------------------------------------------------
## Top-level options. These must be limited to a commonly used subset with
## default values being used for building VelodyneViewer binaries.
## default values being used for building VeloView binaries.
#option(PV_COMMAND_LINE_TOOLS_ONLY
# "Turn this ON to build command lines tools alone." OFF)
......@@ -125,10 +125,10 @@ include(pythonqt)
include(paraview)
include(pcap)
include(boost)
include(velodyneviewer)
include(veloview)
process_dependencies()
if (velodyneviewer_ENABLED)
include(velodyneviewer.bundle OPTIONAL)
if (veloview_ENABLED)
include(veloview.bundle OPTIONAL)
endif()
include(velodyneviewer.bundle.common)
include(veloview.bundle.common)
set (CPACK_GENERATOR DragNDrop)
include(CPack)
......@@ -8,7 +8,7 @@ install(CODE "
\"${install_location}/bin/VeloView.app\")
file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}\" USE_SOURCE_PERMISSIONS TYPE FILE FILES
\"${VelodyneViewerSuperBuild_SOURCE_DIR}/../Documentation/VeloView_Developer_Guide.pdf\")
\"${VeloViewSuperBuild_SOURCE_DIR}/../Documentation/VeloView_Developer_Guide.pdf\")
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/VeloView.app/Contents/Resources/qt.conf\"
\"\")
......
include(velodyneviewer.bundle.common)
include(veloview.bundle.common)
include(CPack)
# install all ParaView's shared libraries.
install(DIRECTORY "${install_location}/lib/paraview-3.98"
install(DIRECTORY "${install_location}/lib/paraview-4.0"
DESTINATION "lib"
USE_SOURCE_PERMISSIONS
COMPONENT superbuild)
# install all velodyne libraries
install(DIRECTORY "${install_location}/lib/velodyne-viewer-${vv_version}"
install(DIRECTORY "${install_location}/lib/veloview-${vv_version}"
DESTINATION "lib"
USE_SOURCE_PERMISSIONS
COMPONENT superbuild)
......@@ -20,10 +20,10 @@ if (qt_ENABLED AND NOT USE_SYSTEM_qt)
# FIXME: we can reconfigure Qt to be built with inbuilt sqllite support to
# avoid the need for plugins.
"${install_location}/plugins/"
DESTINATION "lib/velodyne-viewer-${vv_version}"
DESTINATION "lib/veloview-${vv_version}"
COMPONENT superbuild
PATTERN "*.a" EXCLUDE
PATTERN "velodyne-viewer-${vv_version}" EXCLUDE
PATTERN "veloview-${vv_version}" EXCLUDE
PATTERN "fontconfig" EXCLUDE
PATTERN "*.jar" EXCLUDE
PATTERN "*.debug.*" EXCLUDE
......
......@@ -18,7 +18,7 @@ else()
set(CPACK_PACKAGE_VERSION_PATCH ${vv_version_patch})
endif()
set(CPACK_RESOURCE_FILE_LICENSE "${VelodyneViewerSuperBuild_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${VeloViewSuperBuild_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${package_suffix}")
add_external_project(velodyneviewer
add_external_project(veloview
DEPENDS paraview qt pcap boost
CMAKE_ARGS
......
include(velodyneviewer.bundle.common)
include(veloview.bundle.common)
#------------------------------------------------------------------------------
# set NSIS install specific stuff.
......@@ -58,10 +58,10 @@ if (python_ENABLED AND NOT USE_SYSTEM_python)
endif()
# install paraview python modules and others.
install(DIRECTORY "${install_location}/lib/paraview-3.98"
install(DIRECTORY "${install_location}/lib/paraview-4.0"
DESTINATION "lib"
USE_SOURCE_PERMISSIONS
COMPONENT ${AppName}
COMPONENT ${AppName}
PATTERN "*.lib" EXCLUDE)
......@@ -69,7 +69,7 @@ install(FILES "${wpcap_library_dir}/wpcap.dll" "${wpcap_library_dir}/Packet.dll
DESTINATION "bin"
COMPONENT ${AppName})
install(FILES "${SuperBuild_BINARY_DIR}/velodyneviewer/src/velodyneviewer/Documentation/VeloView_Developer_Guide.pdf"
install(FILES "${VeloViewSuperBuild_SOURCE_DIR}/../Documentation/VeloView_Developer_Guide.pdf"
DESTINATION "doc"
COMPONENT ${AppName})
......
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