From 9632b7a36cec54e8ae7122c8fa854615ac9359f6 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Tue, 16 Jun 2015 10:18:10 -0700 Subject: [PATCH] fix install targets --- .drone.yml | 3 ++- CMakeLists.txt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 37a7e67..181c2d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,7 @@ image: encfs_worker script: - - sh devmode + - sh devmode -DCMAKE_INSTALL_PREFIX:PATH=/tmp/cmake - cd build - make - make test + - make install diff --git a/CMakeLists.txt b/CMakeLists.txt index aa38da9..8fc5690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,11 +113,12 @@ target_link_libraries(encfs ${RLOG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) +install (TARGETS encfs DESTINATION lib) add_executable (encfs-bin encfs/main.cpp) target_link_libraries (encfs-bin encfs) set_target_properties (encfs-bin PROPERTIES OUTPUT_NAME "encfs") -install (TARGETS encfs DESTINATION bin) +install (TARGETS encfs-bin DESTINATION bin) add_executable (encfsctl encfs/encfsctl.cpp) target_link_libraries (encfsctl encfs) @@ -129,7 +130,7 @@ target_link_libraries (makekey encfs) add_executable (checkops encfs/test.cpp) target_link_libraries (checkops encfs) -install (FILES ${CMAKE_SOURCE_DIR}/encfs/encssh DESTINATION bin) +install (FILES encfs/encfssh DESTINATION bin) # Reference all headers, to make certain IDEs happy. file (GLOB_RECURSE all_headers ${CMAKE_SOURCE_DIR}/*.h)