From 0d2e3e90f1758b03266e9f5934d11995d7b9a728 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Wed, 6 Feb 2019 15:59:44 +0100 Subject: Jvpp requirements cleanup - minor bugfixes - cleanup Change-Id: I8aeb2688415ee223ec9faeec6509d2c6999cc947 Signed-off-by: Michal Cmarada --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2074565..f313ca7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,6 @@ # limitations under the License. cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -add_custom_target(install-dep COMMAND make install-dep - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Requirements - ) project(jvpp) @@ -110,9 +107,10 @@ message(" Java home: $ENV{JAVA_HOME}") find_package(Java 1.8 REQUIRED COMPONENTS Development) get_filename_component(jvm_path ${Java_JAVAC_EXECUTABLE} DIRECTORY) set(Java_INCLUDE_DIRS ${jvm_path}/../include ${jvm_path}/../include/linux) - +message(" Java: ${Java_JAVA_EXECUTABLE}") +message(" Java version: ${Java_VERSION_STRING}") message(" Java headers: ${Java_INCLUDE_DIRS}") -message(" Java compiler: ${Java_JAVAC_EXECUTABLE}") +message(" Javac: ${Java_JAVAC_EXECUTABLE}") execute_process(COMMAND ./scripts/verify-installed vpp* OUTPUT_VARIABLE VPP_INSTALLED) string(STRIP "${VPP_INSTALLED}" VPP_INSTALLED) -- cgit 1.2.3-korg