Merge pull request #10014 from elpaso/qjson-nlohmann-followup

Install json_fwd.hpp header
qgis · May 16, 2019 · a2aaf60 · a2aaf60
2 parents cfc78c4 + 90d40d5
commit a2aaf60
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -5,7 +5,6 @@ ENDIF(NOT WIN32)
 
 SET(QGIS_APP_SRCS
   ${CMAKE_SOURCE_DIR}/external/nmea/gmath.c
-  ${CMAKE_SOURCE_DIR}/external/nlohmann/json.hpp
 
   qgisapp.cpp
   qgisappinterface.cpp

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -3,9 +3,6 @@
 
 SET(QGIS_CORE_SRCS
   ${CMAKE_SOURCE_DIR}/external/kdbush/include/kdbush.hpp
-  ${CMAKE_SOURCE_DIR}/external/nlohmann/json.hpp
-  ${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp
-
   ${CMAKE_SOURCE_DIR}/external/nmea/context.c
   ${CMAKE_SOURCE_DIR}/external/nmea/gmath.c
   ${CMAKE_SOURCE_DIR}/external/nmea/info.c
@@ -1323,6 +1320,7 @@ ENDIF(HAVE_OPENCL)
 
 IF(NOT APPLE)
   INSTALL(FILES ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp DESTINATION ${QGIS_INCLUDE_DIR}/nlohmann)
 ELSE(NOT APPLE)
   SET_TARGET_PROPERTIES(qgis_core PROPERTIES
     CLEAN_DIRECT_OUTPUT 1

diff --git a/src/providers/spatialite/CMakeLists.txt b/src/providers/spatialite/CMakeLists.txt
@@ -6,7 +6,6 @@ IF(WITH_QSPATIALITE)
 ENDIF(WITH_QSPATIALITE)
 
 SET(SPATIALITE_SRCS
-  ${CMAKE_SOURCE_DIR}/external/nlohmann/json.hpp
   qgsspatialiteprovider.cpp
   qgsspatialitedataitems.cpp
   qgsspatialiteconnection.cpp