TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-14 14:59:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add mount.dwarfs2 and cleanup CMakeLists.txt

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2020-12-14 18:42:37 +01:00
parent d56367e7fe
commit 4da9055cfb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -205,7 +205,10 @@ if(FUSE3_FOUND)
FUSE_USE_VERSION=35) FUSE_USE_VERSION=35)
set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs) set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs)
target_link_libraries(dwarfs-bin PkgConfig::FUSE3) target_link_libraries(dwarfs-bin PkgConfig::FUSE3)
add_custom_target(mount.dwarfs ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
dwarfs mount.dwarfs)
install(TARGETS dwarfs-bin RUNTIME DESTINATION sbin) install(TARGETS dwarfs-bin RUNTIME DESTINATION sbin)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs DESTINATION sbin)
list(APPEND BINARY_TARGETS dwarfs-bin) list(APPEND BINARY_TARGETS dwarfs-bin)
endif() endif()
@ -215,7 +218,11 @@ if(FUSE_FOUND)
FUSE_USE_VERSION=29) FUSE_USE_VERSION=29)
set_target_properties(dwarfs2-bin PROPERTIES OUTPUT_NAME dwarfs2) set_target_properties(dwarfs2-bin PROPERTIES OUTPUT_NAME dwarfs2)
target_link_libraries(dwarfs2-bin PkgConfig::FUSE) target_link_libraries(dwarfs2-bin PkgConfig::FUSE)
add_custom_target(
mount.dwarfs2 ALL COMMAND ${CMAKE_COMMAND} -E create_symlink dwarfs2
mount.dwarfs2)
install(TARGETS dwarfs2-bin RUNTIME DESTINATION sbin) install(TARGETS dwarfs2-bin RUNTIME DESTINATION sbin)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs2 DESTINATION sbin)
list(APPEND BINARY_TARGETS dwarfs2-bin) list(APPEND BINARY_TARGETS dwarfs2-bin)
endif() endif()
@ -403,9 +410,6 @@ if(WITH_PYTHON)
endif() endif()
endif() endif()
add_custom_target(mount.dwarfs ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
dwarfs mount.dwarfs)
if(STATIC_BUILD_DO_NOT_USE) if(STATIC_BUILD_DO_NOT_USE)
# This is a proper mess, but it does work somehow... # This is a proper mess, but it does work somehow...
set(CMAKE_CXX_LINK_EXECUTABLE set(CMAKE_CXX_LINK_EXECUTABLE
@ -417,15 +421,14 @@ add_custom_target(
realclean realclean
COMMAND COMMAND
rm -rf CMake* CPack* CTest* Makefile Testing bin lib man folly fbthrift rm -rf CMake* CPack* CTest* Makefile Testing bin lib man folly fbthrift
thrift zstd dwarfs* mkdwarfs mount.dwarfs lib*.a *.cmake googletest-* thrift zstd dwarfs* mkdwarfs mount.dwarfs mount.dwarfs2 lib*.a *.cmake
_CPack_Packages install_manifest.txt share) googletest-* _CPack_Packages install_manifest.txt share)
install( install(
TARGETS mkdwarfs dwarfsck dwarfsbench TARGETS mkdwarfs dwarfsck dwarfsbench
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs DESTINATION sbin)
install(FILES ${MAN_PAGES} DESTINATION share/man/man1) install(FILES ${MAN_PAGES} DESTINATION share/man/man1)
if(NOT STATIC_BUILD_DO_NOT_USE) if(NOT STATIC_BUILD_DO_NOT_USE)