Commit 60aeb937 authored by Bastien Jacquet's avatar Bastien Jacquet
Browse files

Merge branch 'Packaging_update'

    Fix packaging issues on OSX, and set a better package name.
parents 08acfb78 456d1d8f
......@@ -2,7 +2,7 @@ add_external_project_or_use_system(boost
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/bootstrap.sh --prefix=<INSTALL_DIR>
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono
BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi
INSTALL_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --prefix=<INSTALL_DIR> install
)
......@@ -12,8 +12,9 @@ if (NOT APPLE AND UNIX)
${SuperBuild_PROJECTS_DIR}/patches/qt.src.3rdparty.webkit.Source.WebKit.pri
<SOURCE_DIR>/src/3rdparty/webkit/Source/WebKit.pri)
elseif (APPLE)
if (NOT DEFINED CMAKE_OSX_SYSROOT OR NOT DEFINED CMAKE_OSX_ARCHITECTURES)
message(FATAL "CMAKE_OSX_SYSROOT or CMAKE_OSX_ARCHITECTURES are not configured")
if ((NOT DEFINED CMAKE_OSX_SYSROOT OR CMAKE_OSX_SYSROOT STREQUAL "")
OR (NOT DEFINED CMAKE_OSX_ARCHITECTURES OR CMAKE_OSX_ARCHITECTURES STREQUAL ""))
message(FATAL_ERROR "CMAKE_OSX_SYSROOT or CMAKE_OSX_ARCHITECTURES are not configured")
endif()
list (APPEND qt_options
#-sdk ${CMAKE_OSX_SYSROOT} #corewlan is failing on 10.9 with 10.11 sdk
......@@ -47,7 +48,7 @@ add_external_project_or_use_system(
-nomake demos
-nomake examples
-nomake tests
-nomake tools
#-nomake tools
-nomake docs
-no-multimedia
-no-openssl
......
......@@ -31,12 +31,18 @@ set(CPACK_PACKAGE_VENDOR "Velodyne Lidar")
set(CPACK_PACKAGE_VERSION_MAJOR ${VV_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VV_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VV_VERSION_PATCH})
if (VV_VERSION_SUFFIX)
if (NOT VV_VERSION_IS_RELEASE)
set(CPACK_PACKAGE_VERSION_PATCH ${VV_VERSION_PATCH}-${VV_VERSION_PATCH_EXTRA})
else()
endif()
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_TIMESTAMP}-${package_suffix}")
if (NOT VV_VERSION_IS_RELEASE)
set(CPACK_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-${VV_VERSION_FULL}-${PACKAGE_TIMESTAMP}-${package_suffix}")
else()
set(CPACK_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-${VV_VERSION_FULL}-${package_suffix}")
endif()
message("Bundled package name will be: ${CPACK_PACKAGE_FILE_NAME}" )
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