diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-02-18 09:22:44 -0500 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-19 08:53:12 +0100 |
commit | eb28616ca1c69184b7b2b4cf4ba96cf4df29f978 (patch) | |
tree | 1610251180d5f8dc8d0814c7636072fc9387176d /CMakeLists.txt | |
parent | e3665c6b2cb135f935eb266c3958b6d639dad1e5 (diff) |
JVPP-22: Update packaging
- rpm package name update according to naming conventions
- vpp instalation verification
- update versioning script
Change-Id: I962895ce636aec949930ea452d1e924024c4b780
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a58d788..2074565 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,20 +102,32 @@ find_path(JAVA_HOME_SET NAMES include/jni.h PATHS ${dirlist}) if (NOT JAVA_HOME_SET) message("JAVA_HOME is not found") else() - message("JAVA HOME: ${JAVA_HOME}") set(ENV{JAVA_HOME} "${JAVA_HOME_SET}") endif() message("\nJAVA:") -message(" JAVA_HOME: $ENV{JAVA_HOME}") - +message(" Java home: $ENV{JAVA_HOME}") find_package(Java 1.8 REQUIRED COMPONENTS Development) -message("JAVA: ${Java}") get_filename_component(jvm_path ${Java_JAVAC_EXECUTABLE} DIRECTORY) set(Java_INCLUDE_DIRS ${jvm_path}/../include ${jvm_path}/../include/linux) message(" Java headers: ${Java_INCLUDE_DIRS}") message(" Java compiler: ${Java_JAVAC_EXECUTABLE}") + +execute_process(COMMAND ./scripts/verify-installed vpp* OUTPUT_VARIABLE VPP_INSTALLED) +string(STRIP "${VPP_INSTALLED}" VPP_INSTALLED) + +if (${VPP_INSTALLED} MATCHES "vpp-dev") + message("\nVPP instalation found.") + message("Packages: \n${VPP_INSTALLED}") +else() + if (${RELEASE_ID} IN_LIST DebianBasedOS) + set(REQUIREMENTS "vpp, vpp-dev, libvppinfra, vpp-plugin-core") + else() + set(REQUIREMENTS "vpp, vpp-devel, vpp-plugins") + endif() + message(FATAL_ERROR "Error VPP is not installed.\nPlease install: ${REQUIREMENTS}.") +endif() + add_subdirectory(java) -#find_package(vpp REQUIRED) |