10 Commits

Author SHA1 Message Date
Even Rouault
917a6e3cdc
QCAMacros.cmake: re-add 25ba36180cfbf836b9458beb98e28f62349c4260 for FreeBSD 2018-06-01 13:23:49 +02:00
Even Rouault
1a4f80428d
QCAMacros.cmake: fix Linux build
25ba36180c causes
build failures on Ubuntu 16.04 and 18.04 with gcc

{{{
/usr/bin/c++    -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I/usr/include/Qca-qt5/QtCrypto  -fPIE   -std=gnu++11 -o CMakeFiles/cmTC_3b936.dir/qcaossl.cpp.o -c /home/even/qgis/QGIS/build/CMakeFiles/CMakeTmp/qcaossl.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtCore/qchar.h:37:0,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qstring.h:41,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/QString:1,
                 from /usr/include/Qca-qt5/QtCrypto/qca_core.h:36,
                 from /usr/include/Qca-qt5/QtCrypto/qca.h:36,
                 from /usr/include/Qca-qt5/QtCrypto/QtCrypto:1,
                 from /home/even/qgis/QGIS/build/CMakeFiles/CMakeTmp/qcaossl.cpp:2:
/usr/include/x86_64-linux-gnu/qt5/QtCore/qglobal.h:1067:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC (-fPIE is not enough)."
 #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
    ^
}}}

qtglobal.h doesn't like -fPIC and -fPIE together

See https://github.com/qgis/QGIS/pull/6093#issuecomment-393518711
2018-06-01 13:22:48 +02:00
Nyall Dawson
8bdec09b3b Revert "Fix QCA-ssl for FreeBSD"
This reverts commit 25ba36180cfbf836b9458beb98e28f62349c4260.

Breaks linux build
2018-06-01 08:32:46 +10:00
lbartoletti
25ba36180c Fix QCA-ssl for FreeBSD 2018-05-31 19:34:07 +10:00
Nyall Dawson
3e1b99be69 Remove a bunch of Qt4 compatibility code 2018-02-06 22:39:42 +11:00
Larry Shaffer
015fdf23ce Update QCA CMake qcatool find function for macOS and Qt5 2017-01-08 17:27:17 -07:00
Matthias Kuhn
d559d7ff25 Partially revert 9bb3235
The -DCMAKE_POSITION_INDEPENDENT_CODE=ON resolves to -fPIE instead
of -fPIC (on some platforms?) rendering cmake broken.
2016-11-23 09:26:44 +01:00
Larry Shaffer
eca83e3c0f Add CMAKE_POSITION_INDEPENDENT_CODE flag to QCA test for OSSL plugin 2016-11-20 17:25:43 -07:00
Larry Shaffer
9bb32357c7 Update finding QCA OSSL plugin for Qt5 and C++11 2016-11-20 15:30:12 -07:00
Larry Shaffer
e65aa99ae7 [FEATURE] Authentication configuration system with master password
- Main C++ core and gui classes and desktop app integration
- Support for authentication method plugins
- Does not contain any integration with service connections
2015-09-21 08:51:18 -06:00