Update the cmake build system, see issue #2 #3
Manually merged
SlavekB
merged 1 commits from feat/cmakeUpdate into master 5 years ago
No reviewers
No Label
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: TDE/tdenetworkmanager#3
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'feat/cmakeUpdate'
Deleting a branch is permanent. It CANNOT be undone. Continue?
Add a man page taken from the Debian packaging system.
WIP:Update the cmake build system, see issue #2to Update the cmake build system, see issue #2 5 years agoA man page, a README and an INSTALL file have been added.
Openvpn and cisco-decrypt (vpnc) ought to be present at run time.
Strongswan and pptp should be present as well.
It looks good. I have some small comments here.
option( BUILD_ALL "Build all" OFF )option( BUILD_DOC "Build documentation" ${BUILD_ALL} )option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )option( WITH_OPENVPN "Build Openvpn plugin" ${BUILD_ALL} )Because VPN plugins are selected as
WITH_*options, they should probably be in the optional stuff and usingWITH_ALL_OPTIONSinstead ofBUILD_ALL.Good catch, I'll change that.
add_definitions(-DHAVE_CONFIG_H)add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )Good idea to move this definition to a common level. In any case, I will try to prepare a patch to fix the need for this definition.
????
great!
The patch is already ready. I'll wait for your adjustments and then push it.
if( WITH_OPENVPN )find_program( OPENVPN_EXEC openvpn )if( NOT OPENVPN_EXEC )tde_message_fatal( "openvpn support has been requested but openvpn was not found on your system" )If the values that were found, we will not use them in the code, then probably do not need to end at fatal. For example, we could use the value in the code as the default path to search for a binary while the application is running. We need to discuss this and find an consensus.
They're not needed to build.
Instead of the macro tde_message_fatal(), we can use just message() to warn the packager or just remove that, any solutions will suit me just fine.
For sure It's better to have the search for openvpn and cisco-decrypt at runtime, but It's rather unlikely that someone will remove the openvpn package or the vpnc package if he intend to use those plugins.
Added comment about nm-util.
##### check for libnm-utilpkg_search_module( NM_UTIL libnm-util )I tested completely remove the nm-util detection and remove the use of
${NM_UTIL_INCLUDE_DIRS}from allCMakeLists.txtand the build was OK. It seems that nm-util is no longer needed for tdenetworkmanager.WITH_GCC_VISIBILITY is OFF by default I can't build with.
Thank you for the reminder, I'll look at it and prepare a patch.
Added patches for TQT_NO_ASCII_CAST and WITH_GCC_VISIBILITY.
Please, you can test it.
Build fine here. you should merge.
Everything looks fine – good work Greg!
1c40516d66.