Commit 238b24ec authored by Arnaud Billon's avatar Arnaud Billon
Browse files

[refactor] Base Bundling Branding off SB

parent b13aaadf
......@@ -4,9 +4,12 @@
if(NOT package_suffix )
message(FATAL_ERROR "package_suffix not set")
endif()
# Enable CPack packaging.
include(${LidarViewSuperBuild_SOURCE_DIR}/../Application/SoftwareInformation/branding.cmake)
if(NOT SOFTWARE_NAME )
message(FATAL_ERROR "SOFTWARE_NAME branding not set")
endif()
if(NOT SOFTWARE_VENDOR )
message(FATAL_ERROR "SOFTWARE_VENDOR branding not set")
endif()
# Include CMake scripts for geting the version from Git
include("${LidarViewSuperBuild_SOURCE_DIR}/../LVCore/CMake/Git.cmake")
......@@ -35,7 +38,7 @@ set(PACKAGE_TIMESTAMP "${GD_YEAR}${GD_MONTH}${GD_DAY}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${SOFTWARE_NAME}")
set(CPACK_PACKAGE_NAME "${SOFTWARE_NAME}")
set(CPACK_PACKAGE_VENDOR "${VENDOR}")
set(CPACK_PACKAGE_SOFTWARE_VENDOR "${SOFTWARE_VENDOR}")
set(CPACK_COMPONENT_LIDARVIEW_DISPLAY_NAME ${SOFTWARE_NAME})
set(CPACK_PACKAGE_VERSION_MAJOR ${LV_VERSION_MAJOR})
......
......@@ -21,8 +21,6 @@
# 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(${LidarViewSuperBuild_SOURCE_DIR}/../Application/SoftwareInformation/branding.cmake)
#Sanitize checks
if(NOT SOFTWARE_NAME )
message(FATAL_ERROR "SOFTWARE_NAME branding not set")
......
cmake_minimum_required(VERSION 3.12)
#Sanitize checks
if(NOT SOFTWARE_NAME OR NOT SOFTWARE_VENDOR)
message(FATAL_ERROR "SOFTWARE_NAME or SOFTWARE_VENDOR branding not set")
endif()
project(LidarViewSuperBuild)
set (SuperBuild_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
set (SuperBuild_PROJECTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Projects")
......@@ -185,11 +190,12 @@ function (superbuild_add_packaging)
list(APPEND superbuild_export_variables
qt5_version)
# pass some variables that are required for packaging step:
list(APPEND superbuild_export_variables
PARAVIEW_VERSION
LV_BUILD_ARCHITECTURE
SOFTWARE_NAME
SOFTWARE_VENDOR
package_suffix
ENABLE_slam
)
......
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