Ticket #1478: 0001-ticket-1478-compile-and-install-raspasswd.patch

File 0001-ticket-1478-compile-and-install-raspasswd.patch, 2.6 KB (added by Dimitar Misev, 7 years ago)

  • rascontrol/CMakeLists.txt 

    From 857cf0b90846cf0f4735262c9d3f9eb545b0d8f1 Mon Sep 17 00:00:00 2001
From: Dimitar Misev <misev@rasdaman.com>
Date: Fri, 17 Feb 2017 13:58:49 +0100
Subject: [PATCH] ticket:1478 - compile and install raspasswd

---
 rascontrol/CMakeLists.txt | 31 ++++++++++++++++---------------
 rascontrol/Makefile.am    |  3 ++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/rascontrol/CMakeLists.txt b/rascontrol/CMakeLists.txt
index 295d97d..3bca623 100644
    a b  
    2121#
    2222###################################################################
    2323
     24find_package(Readline REQUIRED)
     25find_package(OpenSSL REQUIRED)
     26
     27add_executable(raspasswd raspasswd.hh raspasswd.cc
     28              ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh
     29              ../raslib/log_config.cc ../raslib/log_config.hh
     30              ../rascontrol/rasmgr_utils_comm.cc ../rascontrol/rasmgr_utils_comm.hh
     31              ../rascontrol/rasmgr_utils_conf.cc ../rascontrol/rasmgr_utils_conf.hh)
     32
     33target_include_directories(raspasswd PUBLIC ${OPENSSL_INCLUDE_DIR})
     34target_link_libraries(raspasswd network commline ${READLINE_LIBRARIES} ${OPENSSL_LIBRARIES})
     35
     36install(TARGETS raspasswd
     37        DESTINATION ${BIN_DIR})
     38
    2439if (NOT RMANRASNET)
    25     find_package(Readline REQUIRED)
    26     find_package(OpenSSL REQUIRED)
    2740
    2841    add_executable(rascontrol rascontrol.hh rascontrol.cc
    2942            rascontrol_class.cc
    … … if (NOT RMANRASNET)  
    3851    install(TARGETS rascontrol
    3952            DESTINATION ${BIN_DIR})
    4053
    41     add_executable(raspasswd raspasswd.hh raspasswd.cc
    42             rasmgr_utils_comm.hh rasmgr_utils_comm.cc
    43             rasmgr_utils_conf.hh rasmgr_utils_conf.cc
    44             ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh
    45             ../raslib/log_config.cc ../raslib/log_config.hh)
    46 
    47     target_include_directories(raspasswd PUBLIC ${OPENSSL_INCLUDE_DIR})
    48     target_link_libraries(raspasswd network commline ${READLINE_LIBRARIES} ${OPENSSL_LIBRARIES})
    49 
    50     install(TARGETS raspasswd
    51             DESTINATION ${BIN_DIR})
    52 
    53 endif ()
    54  No newline at end of file
     54endif ()

  • rascontrol/Makefile.am 

    diff --git a/rascontrol/Makefile.am b/rascontrol/Makefile.am
index 30bc08a..e237250 100755
    a b SRCCXX=rascontrol.cc rasmgr_utils_comm.cc rasmgrtest.cc raspasswd.cc \  
    3333        rascontrol_class.cc rasmgr_tester.cc rasmgr_utils_conf.cc rasmgrtester_conf.cc
    3434
    3535if RMANRASNET
    36 noinst_PROGRAMS=rascontrol raspasswd
     36noinst_PROGRAMS=rascontrol
     37bin_PROGRAMS=raspasswd
    3738else
    3839bin_PROGRAMS=rascontrol raspasswd
    3940endif