Skip to content
Permalink
Browse files
some fixes
  • Loading branch information
3nids committed May 19, 2021
1 parent 6496349 commit 2e2e86e28fa4b18c6d5f3466b919defb12934ed0
@@ -19,6 +19,10 @@
* SOFTWARE.
*/


#define SIP_NO_FILE


#pragma once
#ifndef QJSONWRAPPER_JSON_H
#define QJSONWRAPPER_JSON_H
@@ -11,7 +11,7 @@ option(WITH_INTERNAL_O2 "Download and locally include source of o2 library" ON)

if(WITH_INTERNAL_O2)
set(O2_SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/o2/src)
set(O2_INCLUDE_DIR "${O2_SOURCE_DIR}" CACHE INTERNAL "Path to o2 library headers" FORCE)
set(O2_INCLUDE_DIR "${O2_SOURCE_DIR}" CACHE INTERNAL "Path to o2 library headers" FORCE)
set(O2_LIBRARY "" CACHE INTERNAL "Path to o2 built shared library" FORCE)
set(O2_LIBRARY_STATIC "" CACHE INTERNAL "Path to o2 built static library" FORCE)
set(O2_FOUND TRUE CACHE INTERNAL "Whether O2 has been found" FORCE)
@@ -98,6 +98,15 @@ foreach(_library_type MODULE STATIC)

target_link_libraries(${_library_name} qgis_core)

if(NOT WITH_INTERNAL_O2)
if(NOT "${O2_LIBRARY}" STREQUAL "")
# prefer dynamic linking
target_link_libraries(${_library_name} ${O2_LIBRARY})
else()
target_link_libraries(${_library_name} ${O2_LIBRARY_STATIC})
endif()
endif()

if(WIN32)
add_definitions(-DO2_DLL_EXPORT)
endif()
@@ -17,7 +17,7 @@

#include <QDir>

#include "qjsonwrapper/Json.h"
#include "Json.h"

#include "qgsapplication.h"
#include "qgslogger.h"
@@ -19,8 +19,13 @@ set(_library_suffix_STATIC "_static")
foreach(_library_type MODULE STATIC)
set(_library_name "oauth2authmethodgui${_library_suffix_${_library_type}}")

#find_package(oauth2authmethod${_library_suffix_${_library_type}} REQUIRED PATHS ${QGIS_PLUGIN_DIR})

add_library(${_library_name} ${_library_type} ${AUTH_OAUTH2_GUI_SRCS} ${AUTH_OAUTH2_GUI_HDRS} ${AUTH_OAUTH2_GUI_UIS_H} ${AUTH_OAUTH2_GUI_RCCS})

add_dependencies(${_library_name} oauth2authmethod_static)
target_link_libraries(${_library_name} oauth2authmethod$_static)

target_include_directories(${_library_name} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -31,7 +36,8 @@ foreach(_library_type MODULE STATIC)
target_compile_features(${_library_name} PRIVATE cxx_std_17)

target_link_libraries (${_library_name}
qgis_gui
qgis_core
qgis_gui
)

target_compile_definitions(${_library_name} PRIVATE "-DQT_NO_FOREACH")
@@ -20,13 +20,14 @@
#include <QDesktopServices>
#include <QUrl>

#include "Json.h"

#include "qgsapplication.h"
#include "qgsauthguiutils.h"
#include "qgsauthmanager.h"
#include "qgsauthconfigedit.h"
#include "qgsmessagelog.h"
#include "qgsnetworkaccessmanager.h"
#include "qjsonwrapper/Json.h"

QgsAuthOAuth2Edit::QgsAuthOAuth2Edit( QWidget *parent )
: QgsAuthMethodEdit( parent )
@@ -3,6 +3,7 @@

set(QGIS_CORE_SRCS
${CMAKE_SOURCE_DIR}/external/kdbush/include/kdbush.hpp

${CMAKE_SOURCE_DIR}/external/nmea/context.c
${CMAKE_SOURCE_DIR}/external/nmea/gmath.c
${CMAKE_SOURCE_DIR}/external/nmea/info.c
@@ -851,9 +852,10 @@ endif()

set(QGIS_CORE_HDRS
${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp
${CMAKE_BINARY_DIR}/qgsconfig.h
${CMAKE_SOURCE_DIR}/external/qjsonwrapper/Json.h

${CMAKE_BINARY_DIR}/qgsconfig.h

../plugins/qgisplugin.h

qgis.h

0 comments on commit 2e2e86e

Please sign in to comment.