diff options
| author |   Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-18 18:19:09 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-18 16:22:55 +0000 |
| commit | f4e4a8d1cee65aff37917ff05dedbb9163628158 (patch) | |
| tree | 645eb4b4009061a7cf85b82260e6c89ca4ebe80c | |
| parent | 7b971d7bdbc6ef9862074accfe7f2015368cb6dd (diff) | |
Fixing libdash dependencies and installing viper as executable
Change-Id: I4ac7aebcc8b60abcc6e0cc4afc49e971d3c4a3da
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libdash/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d92f79c2..ea0db188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +ls -la# Copyright (c) 2017 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -29,7 +29,7 @@ add_custom_target(viper ALL COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/qmake_build/viper_ ./viper DEPENDS ${CMAKE_CURRENT_BINARY_DIR}//qmake_build/viper_) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viper DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/viper DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) # Generate DEB / RPM packages diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index 06f4d35c..129b726f 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.2) project(libdash) set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") @@ -199,7 +199,7 @@ if(DEB_PACKAGE) SET(TYPE "DEBIAN") SET(GENERATOR "DEB") SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}") - SET(CPACK_${TYPE}_PACKAGE_REQUIRES "zlib1g, git-core, libxml2, libcurl4-openssl") + SET(CPACK_${TYPE}_PACKAGE_REQUIRES "zlib1g, git-core, libxml2, libcurl4-openssl-dev") elseif(RPM_PACKAGE) SET(TYPE "RPM") SET(GENERATOR "RPM") |