From 87a7e90e58a795c40afe6acfe96859f5aff6a2c9 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 28 Jan 2019 11:36:44 +0100 Subject: update packaging - fix minor issues - add optional parameters to build ZIP and TGZ packages - updated list of supported OS - updated documentation Change-Id: Ie4ee73fc77232c6bd35644cdd8bb67bb4df42d93 Signed-off-by: Michal Cmarada --- CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 427f31b..c344540 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,16 @@ if (compiler_flag_no_address_of_packed_member) add_definitions(-Wno-address-of-packed-member) endif() +find_package(Threads REQUIRED) + +# OPTIONS +option(PackZip "Create ZIP package (default: fasle)" false) +option(PackTgz "Create Tgz package (default: fasle)" false) + +message("\nOptions:") +message(" PackZip: ${PackZip}") +message(" PackTgz: ${PackTgz}") + message("\nEnvironment Variables:") # JVPP RELATED VARIABLES @@ -49,6 +59,8 @@ message(" JVPP Main Version: ${JVPP_VERSION}") message(" JVPP Version: ${JAPI_LIB_VERSION}") # OS RELATED VARIABLES +list(APPEND DebianBasedOS "Ubuntu" "LinuxMint") +list(APPEND RHBasedOS "CentOS") unset(RELEASE_ID) unset(RELEASE_CODENAME) find_program(LSB_RELEASE_EXEC lsb_release) @@ -70,8 +82,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build-root/lib) set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set(CMAKE_INSTALL_MESSAGE NEVER) -find_package(Threads REQUIRED) - unset(dirlist) macro(subdirlist dirlist dirpath) -- cgit 1.2.3-korg