58 Commits

Author SHA1 Message Date
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
R.J.V. Bertin
b614cdbd6e also set the INSTALL_NAME_DIR for regular Mac libs
Failing to do so can cause linker/loader failures when installing
the QCA library to a non-standard location (e.g. the Qt install tree).
2019-06-08 16:18:03 +02:00
Ivan Romanov
f4b2eb0ced Fix previous commit 2017-01-29 15:20:17 +05:00
Ivan Romanov
9e4bf79543 Fix install framework 2016-05-27 15:41:25 +05:00
Samuel Gaist
f223ce03d4 OS X build and warning fix
The cmake find file was missing, but CoreFoundation being a system
framework, no need to search for it.

Update code to not use deprecated functions/data structure

CSSM_DATA and SecCertificateGetData have been deprecated since 10.7.
This patch uses SecCertificateCopyData which is the official
replacement.

Reviewed at https://git.reviewboard.kde.org/r/125800/
2015-12-08 21:32:39 +01:00
Harald Sitter
088ff642fc Merge branch 'master' into qt5 2015-04-22 13:07:32 +02:00
Samuel Gaist
4fd11c444a Link against CoreFoundation rather than Carbon
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
2015-04-22 13:06:26 +02:00
Harald Sitter
b7f47694f8 Revert "Revert "properly support co-existing qt4 and qt5 versions""
This reverts commit 99128312fb91bc5f8e6320fe052bbaf7648102fe.
2015-01-14 13:51:07 +01:00
Ivan Romanov
99128312fb Revert "properly support co-existing qt4 and qt5 versions"
It's not properly. Martin Klapetek is not QCA developer. So it's not
correct that he said "Ship it!".

Properly way

cmake -DQCA_SUFFIX=qt5 ...

and in CMakeLists.txt of your project.

find_package(Qca NAMES Qca-qt5)

This reverts commit c32bc6f1bc9befe5f89d3572eb28e0d591a2e3b2.
2015-01-14 15:26:33 +05:00
Harald Sitter
c32bc6f1bc properly support co-existing qt4 and qt5 versions
- if QT4_BUILD is not defined *and* Qt5Core is found build with soname
  qca-qt5
- rename cmake package to reflect the suffix i.e. with a Qt5 build it is
  find_package(Qca-qt5) rather than find_package(Qca)
- the imported cmake target also reflects suffix so "Qca-qt5" is the
  cmake link target for qt5 and "Qca" for qt4 builds

this retains 100% compatibility with regular qca while also offering 100%
coinstallability of the qt5 build.

REVIEW: 121633
2014-12-28 14:26:50 +01:00
Harald Sitter
ffc53703ad put headers of a suffixed build in a suffixed directory
this makes the headers co-installable between a suffixed and regular
version

reviewed as part of r121323
2014-12-22 12:50:18 +01:00
Ivan Romanov
5d311c9219 cmake: build for android
Android uses .so as shared library suffix without version
2014-11-27 01:55:46 +05:00
Ivan Romanov
f8fe237c3c cmake: dropped dead variable 2014-11-13 02:13:50 +05:00
Ivan Romanov
0311beb5e5 cmake: do not use trailing slash for normalized paths 2014-11-05 22:42:32 +05:00
Ivan Romanov
5de8ea800d cmake: added new option OSX_FRAMEWORK 2014-11-05 22:42:28 +05:00
Ivan Romanov
d598c689b7 cmake: no install target in developer mode 2014-09-28 21:14:26 +06:00
Ivan Romanov
ac8b8acd37 dropped fixpaths.include
Use qt.conf to set plugin paths for unittests and qcatool in buildtree
2014-09-25 14:27:44 +06:00
Ivan Romanov
3ebc9c14e2 SafeTimer: many fixes
1. SafeTimer now is common and public class. All plugins use this
   implementation.
2. Added debug messages in SafeTimer. Uncomment SAFETIMER_DEBUG to
   enable.
3. TimerFixer skips SafeTimer objects. No need extra fixes for
   SafeTimer. But can be problems with children of SafeTimer I
   believe no such.
2014-09-25 07:26:24 +06:00
Ivan Romanov
bd0390b11c SafeTimer: new implementation
Old SafeTimer is not safe. QTimer dies when it changes thread. New
SafeTimer uses old-level timers which also sensetive for thread
change events. To handle this is here special trick which ressurect
timer in new thread.
2014-09-19 23:09:01 +06: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
Aleix Pol
55093770df Export QCA targets
Makes it easier to adopt QCA by a cmake project by exporting the targets' include paths with the target.

REVIEW: 119231
2014-07-17 17:03:13 +02: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
dc42b9713f fix windows compilation warning
qca_systemstore_win.cpp hasn't Q_OBJECT macro.
It is regular C++ sources file.
2014-02-01 00:53:38 +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
4362678874 Revert "Use qt5 suffix by default when installing a Qt5 version of QCA"
I don't agree with this patch. See my comments on
https://git.reviewboard.kde.org/r/111938/

This reverts commit bfeabc149ed64abc1a6186b9cd3cdd57f89fa5ec.
2013-09-24 01:37:03 +06:00
Alex Richardson
bfeabc149e Use qt5 suffix by default when installing a Qt5 version of QCA
This way coinstallation of Qt4 and Qt5 based QCA is possible by default

REVIEW: 111938
2013-09-03 14:38:32 +02:00
Ivan Romanov
5700a5e2e5 On Windows dll is installing in bin dir 2013-08-28 03:59:20 +06:00
Ivan Romanov
13d0dc5e6d added cmake variable QCA_LIB_SUFFIX
QCA_LIB_SUFFIX intended to replace workaround
3 major version. For building for Qt5 can be used
-DQCA_LIB_SUFFIX=qt5 for example. Result will be
named libqca2-qt5.so.2.0.3 library for Linux.
Also this suffix will be applied for qca2 pkg config file,
qcatool2 binary and qcatool2 manpage.

I hope that is a good way to resolve the building conflict
against qt4 and qt5.
2013-08-26 00:55:01 +06:00
Ivan Romanov
44c7fbb74f install qca to prefix or qt_prefix
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
2013-08-24 21:26:40 +06:00
Ivan Romanov
e0cdd5db40 Revert "install qca to prefix or qt_prefix"
This reverts commit f5cb5b04dcb37ab4a62943c19646bcfa3d7d3b23.
2013-07-25 14:23:16 +06:00
Ivan Romanov
57aa7db0e3 less warnings 2013-07-24 23:52:37 +06:00
Ivan Romanov
f5cb5b04dc install qca to prefix or qt_prefix
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
2013-07-24 22:08:12 +06:00
David Faure
e00ed4ce20 flatfile.cpp is for "other unixes", not for "X11" (which isn't set with qt5)
svn path=/trunk/kdesupport/qca/; revision=1347517
2013-04-02 12:37:47 +00:00
Andre Heinecke
352e9bffbf Explicitly add an entry to link with ws2_32 on Windows.
Otherwise the build would fail if the Qt libraries do not pull
in ws2_32.

svn path=/trunk/kdesupport/qca/; revision=1196710
2010-11-13 23:16:29 +00:00
Christian Ehrlicher
091118b715 make it work with cmake again
svn path=/trunk/kdesupport/qca/; revision=809036
2008-05-18 06:50:01 +00:00
Christian Ehrlicher
4052cd4918 make it work with cmake 2.6.0-rc6 on windows
svn path=/trunk/kdesupport/qca/; revision=793329
2008-04-03 17:11:08 +00:00
Christian Ehrlicher
9ac3664f76 more win32 fixes
svn path=/trunk/kdesupport/qca/; revision=712894
2007-09-15 16:01:02 +00:00
Laurent Montel
b34c1ce1cd Don't hardcode lib soname in pc file
svn path=/trunk/kdesupport/qca/; revision=704936
2007-08-26 17:05:22 +00:00
Christian Ehrlicher
3f38ef2061 include CheckIncludeFiles script
svn path=/trunk/kdesupport/qca/; revision=702697
2007-08-21 04:54:02 +00:00
Adriaan de Groot
54a5a1cfba Some benighted systems pass a char * to mlock; there
may be a -D to switch behavior (-D_XDG_4_2 seems like a candidate, but
fails in other system include headers) which I can't find right now.
So check the type of the first argument of mlock(2) and #define
types and casts in the few cases where mlock(2) is used.

CCMAIL: bradh@frogmouth.net
CCMAIL: kde-solaris@kde.org

svn path=/trunk/kdesupport/qca/; revision=700540
2007-08-15 20:01:32 +00:00
Adriaan de Groot
af40671759 Sometimes FIONREAD needs to come from sys/filio.h; check for presence and add (somewhat hackishly) as a -D define (to avoid creating a config.h).
svn path=/trunk/kdesupport/qca/; revision=700527
2007-08-15 19:23:24 +00:00
Will Stephenson
81b9b7b34b I am Justin's deferred garbage collection routine.
svn path=/trunk/kdesupport/qca/; revision=663750
2007-05-12 08:38:34 +00:00
Brad Hards
d56939998a Update the cmake build to reflect recent changes to the
qmake build (which in turn reflects the update to Botan 1.6.2)


svn path=/trunk/kdesupport/qca/; revision=656685
2007-04-22 03:04:04 +00:00
Will Stephenson
f7bb8d3885 Fix the qca2 build; when botantools is updated we have to update our
cmake control files or QCA won't build and neither will Kopete. Please
ping kopete-devel@kde.org or Brad Hards to do this for you if you don't
check that it builds.
CC:infiniti@affinix.com

svn path=/trunk/kdesupport/qca/; revision=656010
2007-04-19 22:08:49 +00:00
Brad Hards
ab312f1352 Fix missing vtable for KeyLoader
svn path=/trunk/kdesupport/qca/; revision=651568
2007-04-08 12:46:16 +00:00
Michel Hermier
2a173aa400 Fix build, may require a clean inside of qca, due to missing vtable...
svn path=/trunk/kdesupport/qca/; revision=651559
2007-04-08 12:13:19 +00:00
Brad Hards
c160db7d39 minor tweak to avoid moc warning.
svn path=/trunk/kdesupport/qca/; revision=649909
2007-04-03 11:24:12 +00:00
Brad Hards
5d26cadeed Add the first cut of a logging capability for QCA.
The design consists of a single system Logger object,
and an AbstractLogDevice which you subclass to do whatever
logging you want, and then just plug into the Logger.

svn path=/trunk/kdesupport/qca/; revision=625453
2007-01-20 07:05:31 +00:00
Laurent Montel
c17ee9c165 Fix install under x86_64
svn path=/trunk/kdesupport/qca/; revision=621723
2007-01-09 16:14:22 +00:00