Summary:
This reverts the QcaMacro changes of
commit 1137ed5f07d137296874f7dd1ee629f903507161 as they seem fairly
unrelated to the actual openssl change and proof to cause persistent issues
with buildability.
Further revert "unbreak build by moving away from deprecated exec_program"
This reverts commit 32419c899c77b8f5ece374d2453ee37e89af7c10.
Which was done in an attempt to remidy the build problems.
Further revert "Actually abort after the message that tells people to set CMAKE_INSTALL_PREFIX"
This reverts commit 63fd27fbce780bccb9c9b3ff6649888cfd809c6a.
Which was also done in an attempt to fix the problems.
BUG: 406353
Test Plan:
- when configuring without any arguments the qmake derived paths are used and correct
- when configuring with CMAKE_INSTALL_PREFIX the paths are accordingly reported below that
QCA prefix is /opt
Plugins will be installed to /opt/lib/qca-qt5
Binary will be installed to /opt/bin
Library will be installed to /opt/lib
Public headers will be installed to /opt/include/Qca-qt5
Private headers will be installed to /opt/include/Qca-qt5
Feature file will be installed to /opt/mkspecs/features
Documentation will be installed to /opt/share/doc/qca-qt5/html
Man page will be installed to /opt/share/man
Pkg-config file will be installed to /opt/lib/pkgconfig
Reviewers: dfaure, arojas, vonreth
Reviewed By: dfaure, arojas
Differential Revision: https://phabricator.kde.org/D20408
Summary:
since 1137ed5f07d137296874f7dd1ee629f903507161 which bumped cmake and
started using TARGET_FILE for the qmake calls qca failed to build for me.
I fail to understand why exactly that is but I suspect it has to do with
the fact that exec_program is deprecated and may not be working
(correctly?) with generator expressions.
moving to the not deprecated execute_process fixes clean builds on my
system and is at the very least a move away from deprecated tech with
no downsides
Test Plan: rm -rf * && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
Reviewers: asturmlechner, dfaure, vonreth
Reviewed By: dfaure
Differential Revision: https://phabricator.kde.org/D20228
This change adds a mandatory dependency on Botan, which is not available at this time within Craft.
As this change was not notified to Sysadmin and because it has left us in a state whereby we are unable to get the Windows CI system back up and running, this is being reverted so it can be brought back online.
Please reintroduce this change once support for having Botan as optional is restored
This reverts commit 47163784d74232e3a844fc42897bffc7eff817b4.
Botan 1.10 will be EOL'd this year. This patch is a rough port to botan 2 API. Also:
- Removes support for botan < 1.10 to simplify code (1.10 was released 7 years ago)
- Ports the cmake module to use pkgconfig, since botan-config doesn't exist anymore in v2.
- To minimize ifdef'd code, botan2 unique_ptr's are release'd
- Removes -ansi C(XX)FLAGS, botan 2 requires C++11
Differential Revision: https://phabricator.kde.org/D11997
Revert "Add missed file"
This reverts commit 4c9f27270e0a7c00c10cbc56ce5c6842b47e5ab2.
FindCoreFoundation.cmake is not needed since CoreFoundation
is a system framework. Its use has been removed by
commit f223ce03d4b94ffbb093fc8be5adf8d968f54434
Acked by: Ivan Čukić
REVIEW: 126285
Currently qca links to the Carbon framework for building however the mac
specific code don't use any Carbon classes but CoreFoundation. This patch
aims to update the code and build script to link to the more generic
CoreFoundation framework which may also allow to build it on iOS (not
verified).
REVIEW: 121703
On Windows when compiling with Visual Studio will be produced special
.pdb files for debuggins purposes. It must be put next to target
runtime (.dll or .exe) file.
Qt/Mac frameworks has two include dirs.
One is the framework include for which CMake will add a -F flag
and the other is an include dir for non-framework Qt modules.
QT_INCLUDE_DIR contains both.
QT_HEADER_DIR is for non-framework Qt modules.
Added new cmake variable SHARED_LIBRARY. By default is on.
When it is off QCA library, plugins, tools, examples and unittests
will be built as static. Also if is used static Qt plugins will be
built as static. Tested with Qt4.
Actual openssl versions might have no AES CTR.
In this case qca-ossl will be compiled without AES CTR.
Also dropped own obsoletes FindOpenSSL.cmake.
System version is better choice.
Added option QCA_INSTALL_IN_QT_PREFIX to provide a way to choose
default prefix for installing qca. By default is ON.
Also added a cache vars.
QCA_PREFIX_INSTALL_DIR
QCA_PLUGINS_INSTALL_DIR
QCA_BINARY_INSTALL_DIR
QCA_LIBRARY_INSTALL_DIR
QCA_FEATURE_INSTALL_DIR
QCA_INCLUDE_INSTALL_DIR
QCA_PRIVATE_INCLUDE_INSTALL_DIR
QCA_DOC_INSTALL_DIR
QCA_MAN_INSTALL_DIR
Added option QCA_INSTALL_IN_QT_PREFIX to provide a way to choose
default prefix for installing qca. By default is ON.
Also added a cache vars.
QCA_PREFIX_INSTALL_DIR
QCA_PLUGINS_INSTALL_DIR
QCA_BINARY_INSTALL_DIR
QCA_LIBRARY_INSTALL_DIR
QCA_FEATURE_INSTALL_DIR
QCA_INCLUDE_INSTALL_DIR
QCA_PRIVATE_INCLUDE_INSTALL_DIR
QCA_DOC_INSTALL_DIR
QCA_MAN_INSTALL_DIR
The unittests are disabled (because of QSKIP)
and the plugins currently break compilation (because of Q_EXPORT_PLUGIN2)
svn path=/trunk/kdesupport/qca/; revision=1338378
If you previously got "libgcrypt seems to be too old", even with
a really recent libgcrypt, this one is for you.
svn path=/trunk/kdesupport/qca/; revision=752573
- update openssl to search for libeay too
- saslservtests needs wsock32
- export CertificateInfoPair to fix qca-openssl linking
- add setenv() to pgpunittest.cpp for win32 - maybe add a check for setenv()
svn path=/trunk/kdesupport/qca/; revision=633918
