Skip to content
Permalink
Browse files

Install json_fwd.hpp header

  • Loading branch information
elpaso committed May 15, 2019
1 parent 607664c commit 90d40d5bb7408cc7afc91387305535f23aacbfb3
Showing with 1 addition and 5 deletions.
  1. +0 −1 src/app/CMakeLists.txt
  2. +1 −3 src/core/CMakeLists.txt
  3. +0 −1 src/providers/spatialite/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
@@ -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

This comment has been minimized.

Copy link
@PeterPetrik

PeterPetrik Aug 15, 2019

Contributor

we miss json_fwd.hpp in the macos builds in the framework header...

@@ -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

0 comments on commit 90d40d5

Please sign in to comment.
You can’t perform that action at this time.