Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Linux: modifications to cmake files to use GTK3 on CentOS and change packages names

Browse Source
This commit is contained in:
Mounir IDRASSI
2019-10-05 19:19:39 +02:00
parent 4fe4cbc568
commit af9e0f0482
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Build/CMakeLists.txt
View File

@@ -12,11 +12,11 @@ endif()
# - Set PROJECT_NAME and CONFLICT_PACKAGE values # - Set PROJECT_NAME and CONFLICT_PACKAGE values
if (NOGUI) if (NOGUI)
set( PROJECT_NAME "VeraCrypt-Console" ) set( PROJECT_NAME "veracrypt-console" )
set( CONFLICT_PACKAGE "VeraCrypt" ) set( CONFLICT_PACKAGE "veracrypt" )
else() else()
set( PROJECT_NAME "VeraCrypt" ) set( PROJECT_NAME "veracrypt" )
set( CONFLICT_PACKAGE "VeraCrypt-Console" ) set( CONFLICT_PACKAGE "veracrypt-console" )
endif() endif()
project(${PROJECT_NAME}) project(${PROJECT_NAME})
@@ -230,9 +230,9 @@ list(GET FULL_VERSION_LIST 0 VERSION)
list(GET FULL_VERSION_LIST 1 RELEASE) list(GET FULL_VERSION_LIST 1 RELEASE)
string(REPLACE "-" "." RELEASE ${RELEASE}) string(REPLACE "-" "." RELEASE ${RELEASE})
set( VENDOR "Idrix" ) set( VENDOR "IDRIX" )
set( LICENSE "VeraCrypt License" ) set( LICENSE "VeraCrypt License" )
set( CONTACT "VeraCrypt <mounir@idrix.fr>" ) set( CONTACT "VeraCrypt Team <veracrypt@idrix.fr>" )
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Disk encryption with strong security based on TrueCrypt." ) set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Disk encryption with strong security based on TrueCrypt." )
set( CPACK_PACKAGE_DESCRIPTION "This package contains binaries for VeraCrypt, a disk encryption with strong security based on TrueCrypt." ) set( CPACK_PACKAGE_DESCRIPTION "This package contains binaries for VeraCrypt, a disk encryption with strong security based on TrueCrypt." )
set( CPACK_PACKAGE_NAME ${PROJECT_NAME} ) set( CPACK_PACKAGE_NAME ${PROJECT_NAME} )
@@ -293,7 +293,7 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
set( CPACK_RPM_PACKAGE_AUTOREQ "no" ) # disable automatic shared libraries dependency detection (most of the time buggy) set( CPACK_RPM_PACKAGE_AUTOREQ "no" ) # disable automatic shared libraries dependency detection (most of the time buggy)
if ( PLATFORM STREQUAL "CentOS" ) if ( PLATFORM STREQUAL "CentOS" )
set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk2") set( CPACK_RPM_PACKAGE_REQUIRES "fuse, device-mapper, gtk3")
elseif ( PLATFORM STREQUAL "openSUSE" ) elseif ( PLATFORM STREQUAL "openSUSE" )
# TODO # TODO
endif() endif()
@@ -314,4 +314,4 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) )
endif() endif()
include(CPack) include(CPack)

0
src/Build/build_cmake_deb.sh Normal file → Executable file
View File

6
src/Build/build_cmake_rpm.sh Normal file → Executable file
View File

@@ -23,7 +23,7 @@ echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries
# This will be the temporary wxWidgets directory # This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildGui export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
make WXSTATIC=1 wxbuild || exit 1 make WXSTATIC=1 WITHGTK3=1 wxbuild || exit 1
make WXSTATIC=1 clean || exit 1 make WXSTATIC=1 clean || exit 1
make WXSTATIC=1 || exit 1 make WXSTATIC=1 || exit 1
make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1
@@ -42,7 +42,7 @@ echo "Building console version of VeraCrypt for RPM using wxWidgets static libra
# This will be the temporary wxWidgets directory # This will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 make WXSTATIC=1 WITHGTK3=1 NOGUI=1 wxbuild || exit 1
make WXSTATIC=1 NOGUI=1 clean || exit 1 make WXSTATIC=1 NOGUI=1 clean || exit 1
make WXSTATIC=1 NOGUI=1 || exit 1 make WXSTATIC=1 NOGUI=1 || exit 1
make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1
@@ -62,4 +62,4 @@ cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PAR
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake || exit 1
cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1
cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake|| exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/CPackConfig.cmake|| exit 1