hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'develop' of github.com:cryfs/cryfs into develop

Browse Source
This commit is contained in:
Sebastian Messmer 2016-02-14 01:54:51 +01:00
commit b5d5264016
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpack/CMakeLists.txt
View File

@ -1,7 +1,8 @@
# We only allow generating distribution packages if: # We only allow generating distribution packages if:
# - it is a release build (to ensure all generated debian packages are fine to be distributed) # - it is a release build (to ensure all generated debian packages are fine to be distributed)
# - tests are not built (because otherwise CPack would start installing googletest with the package as well) # - tests are not built (because otherwise CPack would start installing googletest with the package as well)
if(CMAKE_BUILD_TYPE MATCHES Release AND NOT BUILD_TESTING) string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILDTYPE)
if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING)
if("${CMAKE_VERSION}" VERSION_LESS "3.3") if("${CMAKE_VERSION}" VERSION_LESS "3.3")
# Earlier cmake versions generate .deb packages for which the package manager says they're bad quality # Earlier cmake versions generate .deb packages for which the package manager says they're bad quality
# and asks the user whether they really want to install it. Cmake 3.3 fixes this. # and asks the user whether they really want to install it. Cmake 3.3 fixes this.
@ -37,7 +38,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release AND NOT BUILD_TESTING)
set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS") set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS")
set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "fuse") set(CPACK_DEBIAN_PACKAGE_DEPENDS "fuse")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org")
set(CPACK_RPM_PACKAGE_LICENSE "LGPLv3") set(CPACK_RPM_PACKAGE_LICENSE "LGPLv3")