diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-02-06 15:59:44 +0100 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-27 06:49:09 +0000 |
commit | 0d2e3e90f1758b03266e9f5934d11995d7b9a728 (patch) | |
tree | 4b578d7cf92ef0084c8fa25440dba12217ca9d5d /CMakeLists.txt | |
parent | 30fb245914274df31263867d8c3f041d1fc158a8 (diff) |
Jvpp requirements cleanup
- minor bugfixes
- cleanup
Change-Id: I8aeb2688415ee223ec9faeec6509d2c6999cc947
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
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) |