Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
separate gui/core parts of auth method libraries
  • Loading branch information
3nids committed May 19, 2021
1 parent 8a27bca commit 016e5e7
Show file tree
Hide file tree
Showing 73 changed files with 470 additions and 468 deletions.
File renamed without changes.
File renamed without changes.
47 changes: 2 additions & 45 deletions src/auth/basic/CMakeLists.txt
@@ -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})
27 changes: 27 additions & 0 deletions src/auth/basic/core/CMakeLists.txt
@@ -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.
31 changes: 31 additions & 0 deletions src/auth/basic/gui/CMakeLists.txt
@@ -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.
47 changes: 2 additions & 45 deletions src/auth/esritoken/CMakeLists.txt
@@ -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})
27 changes: 27 additions & 0 deletions src/auth/esritoken/core/CMakeLists.txt
@@ -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.
32 changes: 32 additions & 0 deletions src/auth/esritoken/gui/CMakeLists.txt
@@ -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.
49 changes: 2 additions & 47 deletions src/auth/identcert/CMakeLists.txt
@@ -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})
32 changes: 32 additions & 0 deletions src/auth/identcert/core/CMakeLists.txt
@@ -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.
31 changes: 31 additions & 0 deletions src/auth/identcert/gui/CMakeLists.txt
@@ -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.