fix install targets

This commit is contained in:
Valient Gough 2015-06-16 10:18:10 -07:00
parent d89c69b10c
commit 9632b7a36c
2 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,7 @@
image: encfs_worker image: encfs_worker
script: script:
- sh devmode - sh devmode -DCMAKE_INSTALL_PREFIX:PATH=/tmp/cmake
- cd build - cd build
- make - make
- make test - make test
- make install

View File

@ -113,11 +113,12 @@ target_link_libraries(encfs
${RLOG_LIBRARIES} ${RLOG_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
install (TARGETS encfs DESTINATION lib)
add_executable (encfs-bin encfs/main.cpp) add_executable (encfs-bin encfs/main.cpp)
target_link_libraries (encfs-bin encfs) target_link_libraries (encfs-bin encfs)
set_target_properties (encfs-bin PROPERTIES OUTPUT_NAME "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) add_executable (encfsctl encfs/encfsctl.cpp)
target_link_libraries (encfsctl encfs) target_link_libraries (encfsctl encfs)
@ -129,7 +130,7 @@ target_link_libraries (makekey encfs)
add_executable (checkops encfs/test.cpp) add_executable (checkops encfs/test.cpp)
target_link_libraries (checkops encfs) 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. # Reference all headers, to make certain IDEs happy.
file (GLOB_RECURSE all_headers ${CMAKE_SOURCE_DIR}/*.h) file (GLOB_RECURSE all_headers ${CMAKE_SOURCE_DIR}/*.h)