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

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

Browse Source
This commit is contained in:
Sebastian Messmer 2018-09-19 03:02:10 -07:00
commit 2f9e65f031
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpack/CMakeLists.txt
View File

@ -1,8 +1,7 @@
# 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)
string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILDTYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILDTYPE)
if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING) if(BUILDTYPE MATCHES RELEASE OR BUILDTYPE MATCHES RELWITHDEBINFO)
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.
@ -33,9 +32,9 @@ if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING)
#set(CPACK_NSIS_CONTACT "messmer@cryfs.org") #set(CPACK_NSIS_CONTACT "messmer@cryfs.org")
#set(CPACK_NSIS_MODIFY_PATH ON) #set(CPACK_NSIS_MODIFY_PATH ON)
else(WIN32 AND NOT UNIX) else(WIN32 AND NOT UNIX)
set(CPACK_STRIP_FILES ON) set(CPACK_STRIP_FILES OFF)
set(CPACK_SOURCE_STRIP_FILES ON) set(CPACK_SOURCE_STRIP_FILES OFF)
endif(WIN32 AND NOT UNIX) endif()
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)
@ -49,5 +48,5 @@ if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING)
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postrm") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postrm")
include(CPack) include(CPack)
endif("${CMAKE_VERSION}" VERSION_LESS "3.3") endif()
endif(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING) endif()