Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move qjsonwrapper to external
  • Loading branch information
3nids committed May 19, 2021
1 parent e9c00fd commit 6496349
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 2 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions src/auth/oauth2/core/CMakeLists.txt
Expand Up @@ -52,14 +52,12 @@ set(AUTH_OAUTH2_SRCS
qgso2.cpp
qgsauthoauth2config.cpp
qgsauthoauth2method.cpp
qjsonwrapper/Json.cpp
)

set(AUTH_OAUTH2_HDRS
qgsauthoauth2config.h
qgsauthoauth2method.h
qgso2.h
qjsonwrapper/Json.h
)

if(WITH_INTERNAL_O2)
Expand Down
5 changes: 5 additions & 0 deletions src/core/CMakeLists.txt
Expand Up @@ -13,6 +13,8 @@ set(QGIS_CORE_SRCS

${CMAKE_SOURCE_DIR}/external/meshOptimizer/simplifier.cpp

${CMAKE_SOURCE_DIR}/external/qjsonwrapper/Json.cpp

callouts/qgscallout.cpp
callouts/qgscalloutsregistry.cpp

Expand Down Expand Up @@ -850,6 +852,8 @@ 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

../plugins/qgisplugin.h

qgis.h
Expand Down Expand Up @@ -1852,6 +1856,7 @@ target_include_directories(qgis_core PUBLIC
vectortile
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external/qjsonwrapper
${CMAKE_SOURCE_DIR}/external/kdbush/include
${CMAKE_SOURCE_DIR}/external/nmea
${CMAKE_SOURCE_DIR}/external/rtree/include
Expand Down

0 comments on commit 6496349

Please sign in to comment.