Skip to content
Permalink
Browse files
separate gui/core parts of auth method libraries
  • Loading branch information
3nids committed May 19, 2021
1 parent 8a27bca commit 016e5e785f9f7e79aeaafcf7a3db73645c2d2701
Showing with 470 additions and 468 deletions.
  1. 0 {src/auth/oauth2 → }/cmake/DownloadO2.cmake
  2. 0 {src/auth/oauth2 → }/cmake/FindO2.cmake
  3. +2 −45 src/auth/basic/CMakeLists.txt
  4. +27 −0 src/auth/basic/core/CMakeLists.txt
  5. 0 src/auth/basic/{ → core}/qgsauthbasicmethod.cpp
  6. 0 src/auth/basic/{ → core}/qgsauthbasicmethod.h
  7. +31 −0 src/auth/basic/gui/CMakeLists.txt
  8. 0 src/auth/basic/{ → gui}/qgsauthbasicedit.cpp
  9. 0 src/auth/basic/{ → gui}/qgsauthbasicedit.h
  10. 0 src/auth/basic/{ → gui}/qgsauthbasicedit.ui
  11. 0 src/auth/basic/{ → gui}/qgsauthbasicmethodgui.cpp
  12. +2 −45 src/auth/esritoken/CMakeLists.txt
  13. +27 −0 src/auth/esritoken/core/CMakeLists.txt
  14. 0 src/auth/esritoken/{ → core}/qgsauthesritokenmethod.cpp
  15. 0 src/auth/esritoken/{ → core}/qgsauthesritokenmethod.h
  16. +32 −0 src/auth/esritoken/gui/CMakeLists.txt
  17. 0 src/auth/esritoken/{ → gui}/qgsauthesritokenedit.cpp
  18. 0 src/auth/esritoken/{ → gui}/qgsauthesritokenedit.h
  19. 0 src/auth/esritoken/{ → gui}/qgsauthesritokenedit.ui
  20. 0 src/auth/esritoken/{ → gui}/qgsauthesritokenmethodgui.cpp
  21. +2 −47 src/auth/identcert/CMakeLists.txt
  22. +32 −0 src/auth/identcert/core/CMakeLists.txt
  23. 0 src/auth/identcert/{ → core}/qgsauthidentcertmethod.cpp
  24. 0 src/auth/identcert/{ → core}/qgsauthidentcertmethod.h
  25. +31 −0 src/auth/identcert/gui/CMakeLists.txt
  26. 0 src/auth/identcert/{ → gui}/qgsauthidentcertedit.cpp
  27. 0 src/auth/identcert/{ → gui}/qgsauthidentcertedit.h
  28. 0 src/auth/identcert/{ → gui}/qgsauthidentcertedit.ui
  29. 0 src/auth/identcert/{ → gui}/qgsauthidentcertmethodgui.cpp
  30. +3 −187 src/auth/oauth2/CMakeLists.txt
  31. +0 −51 src/auth/oauth2/cmake/FindQtKeychain.cmake
  32. +109 −0 src/auth/oauth2/core/CMakeLists.txt
  33. 0 src/auth/oauth2/{ → core}/qgsauthoauth2config.cpp
  34. 0 src/auth/oauth2/{ → core}/qgsauthoauth2config.h
  35. 0 src/auth/oauth2/{ → core}/qgsauthoauth2method.cpp
  36. 0 src/auth/oauth2/{ → core}/qgsauthoauth2method.h
  37. 0 src/auth/oauth2/{ → core}/qgso2.cpp
  38. 0 src/auth/oauth2/{ → core}/qgso2.h
  39. 0 src/auth/oauth2/{ → core}/qjsonwrapper/Json.cpp
  40. 0 src/auth/oauth2/{ → core}/qjsonwrapper/Json.h
  41. 0 src/auth/oauth2/{ → core}/qjsonwrapper/LICENSE
  42. 0 src/auth/oauth2/{ → core}/qjsonwrapper/README.md
  43. +42 −0 src/auth/oauth2/gui/CMakeLists.txt
  44. 0 src/auth/oauth2/{ → gui}/oauth2_resources.qrc
  45. 0 src/auth/oauth2/{ → gui}/oauth2_resources/close.svg
  46. 0 src/auth/oauth2/{ → gui}/oauth2_resources/export.svg
  47. 0 src/auth/oauth2/{ → gui}/oauth2_resources/fileopen.svg
  48. 0 src/auth/oauth2/{ → gui}/oauth2_resources/hidden.svg
  49. 0 src/auth/oauth2/{ → gui}/oauth2_resources/import.svg
  50. 0 src/auth/oauth2/{ → gui}/oauth2_resources/visible.svg
  51. 0 src/auth/oauth2/{ → gui}/oauth2_resources/visible_red.svg
  52. 0 src/auth/oauth2/{ → gui}/qgsauthoauth2edit.cpp
  53. 0 src/auth/oauth2/{ → gui}/qgsauthoauth2edit.h
  54. 0 src/auth/oauth2/{ → gui}/qgsauthoauth2edit.ui
  55. 0 src/auth/oauth2/{ → gui}/qgsauthoauth2methodgui.cpp
  56. +2 −46 src/auth/pkipaths/CMakeLists.txt
  57. +32 −0 src/auth/pkipaths/core/CMakeLists.txt
  58. 0 src/auth/pkipaths/{ → core}/qgsauthpkipathsmethod.cpp
  59. 0 src/auth/pkipaths/{ → core}/qgsauthpkipathsmethod.h
  60. +31 −0 src/auth/pkipaths/gui/CMakeLists.txt
  61. 0 src/auth/pkipaths/{ → gui}/qgsauthpkipathsedit.cpp
  62. 0 src/auth/pkipaths/{ → gui}/qgsauthpkipathsedit.h
  63. 0 src/auth/pkipaths/{ → gui}/qgsauthpkipathsedit.ui
  64. 0 src/auth/pkipaths/{ → gui}/qgsauthpkipathsmethodgui.cpp
  65. +2 −47 src/auth/pkipkcs12/CMakeLists.txt
  66. +32 −0 src/auth/pkipkcs12/core/CMakeLists.txt
  67. 0 src/auth/pkipkcs12/{ → core}/qgsauthpkcs12method.cpp
  68. 0 src/auth/pkipkcs12/{ → core}/qgsauthpkcs12method.h
  69. +31 −0 src/auth/pkipkcs12/gui/CMakeLists.txt
  70. 0 src/auth/pkipkcs12/{ → gui}/qgsauthpkcs12edit.cpp
  71. 0 src/auth/pkipkcs12/{ → gui}/qgsauthpkcs12edit.h
  72. 0 src/auth/pkipkcs12/{ → gui}/qgsauthpkcs12edit.ui
  73. 0 src/auth/pkipkcs12/{ → gui}/qgsauthpkcs12methodgui.cpp
File renamed without changes.
File renamed without changes.
@@ -1,49 +1,6 @@
set(AUTH_BASIC_SRCS
qgsauthbasicmethod.cpp
)
if (WITH_GUI)
set(AUTH_BASIC_SRCS ${AUTH_BASIC_SRCS}
qgsauthbasicmethodgui.cpp
qgsauthbasicedit.cpp
)
endif()

set(AUTH_BASIC_HDRS
qgsauthbasicmethod.h
)
if (WITH_GUI)
set(AUTH_BASIC_HDRS ${AUTH_BASIC_HDRS}
qgsauthbasicedit.h
)
endif()

include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)

if (WITH_GUI)
set(AUTH_BASIC_UIS qgsauthbasicedit.ui)
QT5_WRAP_UI(AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
add_library(basicauthmethod MODULE ${AUTH_BASIC_SRCS} ${AUTH_BASIC_HDRS} ${AUTH_BASIC_UIS_H})
else()
add_library(basicauthmethod MODULE ${AUTH_BASIC_SRCS} ${AUTH_BASIC_HDRS})
endif()

# require c++17
target_compile_features(basicauthmethod PRIVATE cxx_std_17)

target_link_libraries(basicauthmethod
qgis_core
)

add_subdirectory(core)
if (WITH_GUI)
target_link_libraries (basicauthmethod
qgis_gui
)
add_subdirectory(gui)
endif()

target_compile_definitions(basicauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS basicauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
@@ -0,0 +1,27 @@
set(AUTH_BASIC_SRCS
qgsauthbasicmethod.cpp
)

set(AUTH_BASIC_HDRS
qgsauthbasicmethod.h
)

add_library(basicauthmethod MODULE ${AUTH_BASIC_SRCS} ${AUTH_BASIC_HDRS})

# require c++17
target_compile_features(basicauthmethod PRIVATE cxx_std_17)

target_include_directories(basicauthmethod PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

target_link_libraries(basicauthmethod
qgis_core
)

target_compile_definitions(basicauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS basicauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,31 @@
set(AUTH_BASIC_GUI_SRCS}
qgsauthbasicmethodgui.cpp
qgsauthbasicedit.cpp
)

set(AUTH_BASIC_GUI_HDRS
qgsauthbasicedit.h
)

set(AUTH_BASIC_GUI_UIS qgsauthbasicedit.ui)
QT5_WRAP_UI(AUTH_BASIC_GUI_UIS_H ${AUTH_BASIC_GUI_UIS})
add_library(basicauthmethodgui MODULE ${AUTH_BASIC_GUI_SRCS} ${AUTH_BASIC_GUI_HDRS} ${AUTH_BASIC_GUI_UIS_H})

target_include_directories(basicauthmethod PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

# require c++17
target_compile_features(basicauthmethodgui PRIVATE cxx_std_17)

target_link_libraries (basicauthmethodgui
qgis_gui
)

target_compile_definitions(basicauthmethodgui PRIVATE "-DQT_NO_FOREACH")

install(TARGETS basicauthmethodgui
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,49 +1,6 @@
set(AUTH_ESRI_TOKEN_SRCS
qgsauthesritokenmethod.cpp
)
if (WITH_GUI)
set(AUTH_ESRI_TOKEN_SRCS ${AUTH_ESRI_TOKEN_SRCS}
qgsauthesritokenmethodgui.cpp
qgsauthesritokenedit.cpp
)
endif()

set(AUTH_ESRI_TOKEN_HDRS
qgsauthesritokenmethod.h
)
if (WITH_GUI)
set(AUTH_ESRI_TOKEN_HDRS ${AUTH_ESRI_TOKEN_HDRS}
qgsauthesritokenedit.h
)
endif()

include_directories (
${CMAKE_CURRENT_BINARY_DIR}
)

if (WITH_GUI)
set(AUTH_ESRI_TOKEN_UIS qgsauthesritokenedit.ui)
QT5_WRAP_UI(AUTH_ESRI_TOKEN_UIS_H ${AUTH_ESRI_TOKEN_UIS})
add_library(esritokenauthmethod MODULE ${AUTH_ESRI_TOKEN_SRCS} ${AUTH_ESRI_TOKEN_HDRS} ${AUTH_ESRI_TOKEN_UIS_H})
else()
add_library(esritokenauthmethod MODULE ${AUTH_ESRI_TOKEN_SRCS} ${AUTH_ESRI_TOKEN_HDRS})
endif()

# require c++17
target_compile_features(esritokenauthmethod PRIVATE cxx_std_17)

target_link_libraries(esritokenauthmethod
qgis_core
)

add_subdirectory(core)
if (WITH_GUI)
target_link_libraries(esritokenauthmethod
qgis_gui
)
add_subdirectory(gui)
endif()

target_compile_definitions(esritokenauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS esritokenauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
@@ -0,0 +1,27 @@
set(AUTH_ESRITOKENTOKEN_SRCS
qgsauthesritokenmethod.cpp
)

set(AUTH_ESRITOKEN_HDRS
qgsauthesritokenmethod.h
)

add_library(esritokenauthmethod MODULE ${AUTH_ESRITOKEN_SRCS} ${AUTH_ESRITOKEN_HDRS})

# require c++17
target_compile_features(esritokenauthmethod PRIVATE cxx_std_17)

target_include_directories(esritokenauthmethod PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

target_link_libraries(esritokenauthmethod
qgis_core
)

target_compile_definitions(esritokenauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS esritokenauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
@@ -0,0 +1,32 @@
set(AUTH_ESRITOKEN_GUI_SRCS}
qgsauthesritokenmethodgui.cpp
qgsauthesritokenedit.cpp
)

set(AUTH_ESRITOKEN_GUI_HDRS
qgsauthesritokenedit.h
)


set(AUTH_ESRITOKEN_GUI_UIS qgsauthesritokenedit.ui)
QT5_WRAP_UI(AUTH_ESRITOKEN_GUI_UIS_H ${AUTH_ESRITOKEN_GUI_UIS})
add_library(esritokenauthmethodgui MODULE ${AUTH_ESRITOKEN_GUI_SRCS} ${AUTH_ESRITOKEN_GUI_HDRS} ${AUTH_ESRITOKEN_GUI_UIS_H})

# require c++17
target_compile_features(esritokenauthmethodgui PRIVATE cxx_std_17)

target_include_directories(esritokenauthmethodgui PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

target_link_libraries (esritokenauthmethodgui
qgis_gui
)

target_compile_definitions(esritokenauthmethodgui PRIVATE "-DQT_NO_FOREACH")

install(TARGETS esritokenauthmethodgui
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,51 +1,6 @@
set(AUTH_IDENTCERT_SRCS
qgsauthidentcertmethod.cpp
)
if (WITH_GUI)
set(AUTH_IDENTCERT_SRCS ${AUTH_IDENTCERT_SRCS}
qgsauthidentcertmethodgui.cpp
qgsauthidentcertedit.cpp
)
endif()

set(AUTH_IDENTCERT_HDRS
qgsauthidentcertmethod.h
)
if (WITH_GUI)
set(AUTH_IDENTCERT_HDRS ${AUTH_IDENTCERT_HDRS}
qgsauthidentcertedit.h
)
endif()

include_directories (SYSTEM
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

if (WITH_GUI)
set(AUTH_IDENTCERT_UIS qgsauthidentcertedit.ui)
QT5_WRAP_UI (AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
add_library (identcertauthmethod MODULE ${AUTH_IDENTCERT_SRCS} ${AUTH_IDENTCERT_HDRS} ${AUTH_IDENTCERT_UIS_H})
else()
add_library (identcertauthmethod MODULE ${AUTH_IDENTCERT_SRCS} ${AUTH_IDENTCERT_HDRS})
endif()

# require c++17
target_compile_features(identcertauthmethod PRIVATE cxx_std_17)

target_link_libraries (identcertauthmethod
qgis_core
)

add_subdirectory(core)
if (WITH_GUI)
target_link_libraries (identcertauthmethod
qgis_gui
)
add_subdirectory(gui)
endif()

target_compile_definitions(identcertauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS identcertauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
@@ -0,0 +1,32 @@
set(AUTH_IDENTCERT_SRCS
qgsauthidentcertmethod.cpp
)

set(AUTH_IDENTCERT_HDRS
qgsauthidentcertmethod.h
)

add_library(identcertauthmethod MODULE ${AUTH_IDENTCERT_SRCS} ${AUTH_IDENTCERT_HDRS})

target_include_directories(identcertauthmethod SYSTEM PUBLIC
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
)

target_include_directories(identcertauthmethod PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

# require c++17
target_compile_features(identcertauthmethod PRIVATE cxx_std_17)

target_link_libraries(identcertauthmethod
qgis_core
)

target_compile_definitions(identcertauthmethod PRIVATE "-DQT_NO_FOREACH")

install(TARGETS identcertauthmethod
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
@@ -0,0 +1,31 @@
set(AUTH_IDENTCERT_GUI_SRCS}
qgsauthidentcertmethodgui.cpp
qgsauthidentcertedit.cpp
)

set(AUTH_IDENTCERT_GUI_HDRS
qgsauthidentcertedit.h
)

set(AUTH_IDENTCERT_GUI_UIS qgsauthidentcertedit.ui)
QT5_WRAP_UI(AUTH_IDENTCERT_GUI_UIS_H ${AUTH_IDENTCERT_GUI_UIS})
add_library(identcertauthmethodgui MODULE ${AUTH_IDENTCERT_GUI_SRCS} ${AUTH_IDENTCERT_GUI_HDRS} ${AUTH_IDENTCERT_GUI_UIS_H})

target_include_directories(identcertauthmethodgui PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

# require c++17
target_compile_features(identcertauthmethodgui PRIVATE cxx_std_17)

target_link_libraries(identcertauthmethodgui
qgis_gui
)

target_compile_definitions(identcertauthmethodgui PRIVATE "-DQT_NO_FOREACH")

install(TARGETS identcertauthmethodgui
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 016e5e7

Please sign in to comment.