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

Fix CPack package generation

Browse Source
This commit is contained in:
Sebastian Messmer 2016-02-12 11:12:14 +01:00
parent 8f5e5640de
commit 3ecbef6d11
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpack/CMakeLists.txt
View File

@ -1,4 +1,7 @@
if(CMAKE_BUILD_TYPE MATCHES Release) # We only allow generating distribution packages if:
# - 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)
if(CMAKE_BUILD_TYPE 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.
@ -28,8 +31,8 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
#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 "bin/cryfs") set(CPACK_STRIP_FILES ON)
set(CPACK_SOURCE_STRIP_FILES "") set(CPACK_SOURCE_STRIP_FILES ON)
endif(WIN32 AND NOT UNIX) endif(WIN32 AND NOT UNIX)
set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS") set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS")
set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
@ -42,4 +45,4 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
include(CPack) include(CPack)
endif("${CMAKE_VERSION}" VERSION_LESS "3.3") endif("${CMAKE_VERSION}" VERSION_LESS "3.3")
endif(CMAKE_BUILD_TYPE MATCHES Release) endif(CMAKE_BUILD_TYPE MATCHES Release AND NOT BUILD_TESTING)

3
vendor/googletest/CMakeLists.txt vendored
View File

@ -1,9 +1,6 @@
include(CTest) include(CTest)
if (BUILD_TESTING) if (BUILD_TESTING)
function(install)
# Do nothing. This disables cmake install() commands in googletest.
endfunction()
add_subdirectory(gtest-1.7.0) add_subdirectory(gtest-1.7.0)
project (googletest) project (googletest)