25 Commits

Author SHA1 Message Date
Tobias Junghans
2c3992f075 Add Qt 6 build support
The Core5Compat module is still required for QTextCodec and some
difficult remaining QRegExp -> QRegularExpression migrations.
2021-05-29 22:28:27 +00:00
Albert Astals Cid
f944220634 Modernize cmake a bit: Remove confusing else and endif text 2020-02-15 12:29:54 +01:00
Albert Astals Cid
d71f4c279b Drop Qt4 support 2020-01-19 17:19:23 +01:00
Harald Sitter
b38e904a4e Partially revert "Require CMake 3.4 and use the OpenSSL imported libs"
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
2019-04-23 14:03:50 +02:00
Harald Sitter
32419c899c unbreak build by moving away from deprecated exec_program
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
2019-04-08 11:32:48 +02:00
Hannah von Reth
1137ed5f07 Require CMake 3.4 and use the OpenSSL imported libs
Summary:
Fixes
 00:09:45.140 [162/278] Linking CXX shared module lib/qca-qt5/crypto/libqca-ossl.dylib
00:09:45.140 FAILED: lib/qca-qt5/crypto/libqca-ossl.dylib
00:09:45.140 : && /usr/bin/clang++ -O2 -g -DNDEBUG -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -bundle -Wl,-headerpad_max_install_names  -o lib/qca-qt5/crypto/libqca-ossl.dylib plugins/qca-ossl/CMakeFiles/qca-ossl.dir/qca-ossl.cpp.o  lib/qca-qt5.framework/Versions/2.2.0/qca-qt5 /Users/packaging/Craft/BinaryCache/macos-64-clang/lib/libssl.dylib /Users/packaging/Craft/BinaryCache/macos-64-clang/lib/libcrypto.dylib -lcrypto /Users/packaging/Craft/BinaryCache/macos-64-clang/lib/QtCore.framework/QtCore -framework CoreFoundation -framework Security && :
00:09:45.140 ld: library not found for -lcrypto
00:09:45.140 clang: error: linker command failed with exit code 1 (use -v to see invocation)

Reviewers: dfaure, bcooksley, volkov

Reviewed By: dfaure

Differential Revision: https://phabricator.kde.org/D17913
2019-03-04 12:16:36 +01:00
Rolf Eike Beer
eb5eeca609 fix the mkspecs install directory when cross-compiling using Qt5
REVIEW:128308
2016-07-02 19:05:19 +02:00
Ivan Romanov
0311beb5e5 cmake: do not use trailing slash for normalized paths 2014-11-05 22:42:32 +05:00
Ivan Romanov
efd70c659e cmake: rewritten config package
Fixed algorythm to check for relocatable package.
On Windows when installing to Qt5 prefix QCA will not be relocatable.
2014-08-12 13:22:23 +06:00
Ivan Romanov
fbdf57f843 cmake: install .PDB files
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.
2014-02-03 02:05:54 +06:00
Ivan Romanov
01bf129066 fix previous commit 2014-02-02 02:39:32 +06:00
Ivan Romanov
9504d1c8e0 cmake: put all runtime to bin when compiling
The most it is need for windows where no rpath and all dll's must be
in the same dir (or in PATH environment)
2014-02-02 02:35:55 +06:00
Ivan Romanov
184db75d4b cmake: use QT_HEADER_DIR instead of QT_INCLUDE_DIR
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.
2014-01-28 17:33:58 +06:00
Ivan Romanov
6d690c0070 Build static QCA
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.
2014-01-02 03:50:18 +06:00
Ivan Romanov
4edfa3fcba fixed previous commit 2014-01-02 00:02:12 +06:00
Ivan Romanov
1c09b7b8b1 Dropped own FindQt4 cmake module use system one 2014-01-01 22:32:10 +06:00
Ivan Romanov
5d06579605 Use internal cache vars to choose plugins for building
It allow to know will be particular plugin build or no
in any place of cmake rules.
2014-01-01 02:10:15 +06:00
Ivan Romanov
eb011df617 fixed previous commit 2013-08-27 03:50:45 +06:00
Ivan Romanov
1c6dbab41a fix Qt5 mkspecs install dir 2013-08-27 03:41:39 +06:00
Ivan Romanov
5f6e1759ed install in qt5 prefix 2013-08-24 21:27:08 +06:00
David Faure
6e0134f3b3 Port to Qt5 (when Qt5 is found, otherwise use Qt4)
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
2013-02-07 20:19:00 +00:00
Brad Hards
6849a3d186 Fix the test for built-in (system) certificate store. We
should only use the provided certs if no system certs
are available.

svn path=/trunk/kdesupport/qca/; revision=615322
2006-12-21 04:18:17 +00:00
Laurent Montel
ba66e7a1cd Add "-DWIN32" when we generate moc file under windows
otherwise when we have a #ifdef Q_OS_WIN into .cpp file which
is used to generate moc file, moc doen't know Q_OS_WIN
=> it doesn't generate good moc file.

Thanks Simon to help me.


svn path=/trunk/kdesupport/qca/; revision=605587
2006-11-17 10:39:06 +00:00
Brad Hards
8c08bf89e3 A general cleanup of the cmake support for QCA.
This fixes the problem associated with not being able to
install the bundled certificates.

It also ensures that the plugins get installed into an
appropriate directory.

Note that this does not fix problems associated with
not finding the system certificate stores.


svn path=/trunk/kdesupport/qca/; revision=593549
2006-10-08 06:53:40 +00:00
Laurent Montel
48157e0d49 Merge my patch and duncan patch
CCMAIL: duncan@kde.org

Now we can compile qca with cmake
Need to fix plugins compile and unitest and other small error.

svn path=/trunk/kdesupport/qca/; revision=591302
2006-10-02 09:59:51 +00:00