Skip to content

Commit ca7a008

Browse files
committed
Add qca-qt5 port
1 parent 6054c2e commit ca7a008

File tree

6 files changed

+805
-0
lines changed

6 files changed

+805
-0
lines changed
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
2+
index 1f84c2c9e..f72ee9d8d 100644
3+
--- "a/CMakeLists.txt"
4+
+++ "b/CMakeLists.txt"
5+
@@ -58,6 +58,7 @@ set(QCA_SUFFIX "qt5")
6+
if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC)
7+
set(STATIC_PLUGINS ON)
8+
add_definitions(-DQT_STATICPLUGIN)
9+
+ add_definitions(-DQCA_STATIC)
10+
set(PLUGIN_TYPE "STATIC")
11+
else()
12+
set(PLUGIN_TYPE "MODULE")
13+
@@ -266,10 +267,17 @@ if(DEVELOPER_MODE)
14+
add_definitions(-DDEVELOPER_MODE)
15+
16+
# To prefer plugins from build tree when run qca from build tree
17+
- file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
18+
-"[Paths]
19+
-Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}
20+
-")
21+
+ if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC)
22+
+ file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
23+
+ "[Paths]
24+
+ Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}
25+
+ ")
26+
+ else()
27+
+ file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
28+
+ "[Paths]
29+
+ Plugins=${CMAKE_BINARY_DIR}/bin/${QCA_LIB_NAME}
30+
+ ")
31+
+ endif()
32+
endif()
33+
34+
if (APPLE)
35+
@@ -309,7 +317,7 @@ else()
36+
set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem")
37+
# note that INSTALL_FILES targets are relative to the current installation prefix...
38+
if(NOT DEVELOPER_MODE)
39+
- install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs")
40+
+ install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs")
41+
endif()
42+
endif()
43+
message(STATUS "certstore path: " ${qca_CERTSTORE})
44+
@@ -390,10 +398,10 @@ endif()
45+
include(CMakePackageConfigHelpers)
46+
configure_package_config_file(
47+
"${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
48+
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
49+
- INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
50+
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
51+
+ INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/share/qca/cmake
52+
)
53+
-write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
54+
+write_basic_config_version_file("${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
55+
56+
if(NOT DEVELOPER_MODE)
57+
58+
@@ -461,10 +469,10 @@ if(NOT DEVELOPER_MODE)
59+
endif()
60+
endif()
61+
62+
- install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
63+
+ install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
64+
install(FILES
65+
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
66+
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
67+
- DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
68+
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
69+
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
70+
+ DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake
71+
)
72+
endif()
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 8d67288a3dde7e535ff747715f96f98282a3bf67 Mon Sep 17 00:00:00 2001
2+
From: Matthias Kuhn <[email protected]>
3+
Date: Fri, 3 Dec 2021 15:17:25 +0100
4+
Subject: [PATCH] Ifdef codecs
5+
6+
---
7+
cmake/modules/QcaMacro.cmake | 9 ---------
8+
plugins/qca-ossl/qca-ossl.cpp | 6 ++++++
9+
2 files changed, 6 insertions(+), 9 deletions(-)
10+
11+
diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake
12+
index 80af6e84..ba86310d 100644
13+
--- a/cmake/modules/QcaMacro.cmake
14+
+++ b/cmake/modules/QcaMacro.cmake
15+
@@ -65,10 +65,6 @@ macro(add_qca_test TARGET DESCRIPTION)
16+
endmacro(add_qca_test)
17+
18+
macro(install_pdb TARGET INSTALL_PATH)
19+
- if(MSVC)
20+
- install(FILES $<TARGET_PDB_FILE:${TARGET}> DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug)
21+
- install(FILES $<TARGET_PDB_FILE:${TARGET}> DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo)
22+
- endif()
23+
endmacro(install_pdb)
24+
25+
macro(normalize_path PATH)
26+
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From f32f5ae8b8b49653bfff87f2f882862bcaa8c3f1 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
3+
=?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <[email protected]>
4+
Date: Mon, 20 Mar 2023 16:21:18 +0100
5+
Subject: [PATCH] Define NOMINMAX to fix building qca-botan plugin with MSVC
6+
7+
---
8+
plugins/qca-botan/CMakeLists.txt | 4 ++++
9+
1 file changed, 4 insertions(+)
10+
11+
diff --git a/plugins/qca-botan/CMakeLists.txt b/plugins/qca-botan/CMakeLists.txt
12+
index 11c0d20..9b8b978 100644
13+
--- a/plugins/qca-botan/CMakeLists.txt
14+
+++ b/plugins/qca-botan/CMakeLists.txt
15+
@@ -11,6 +11,10 @@ if(BOTAN_FOUND)
16+
set(QCA_BOTAN_SOURCES qca-botan.cpp)
17+
add_library(qca-botan ${PLUGIN_TYPE} ${QCA_BOTAN_SOURCES})
18+
19+
+ if(MSVC)
20+
+ target_compile_definitions(qca-botan PRIVATE NOMINMAX)
21+
+ endif()
22+
+
23+
if(APPLE AND ${PLUGIN_TYPE} STREQUAL "MODULE")
24+
set_property(TARGET qca-botan PROPERTY SUFFIX ".dylib")
25+
endif()
26+
--
27+
2.40.0.windows.1
28+

0 commit comments

Comments
 (0)