Skip to content

Commit

Permalink
fix Mac install location for qgis_quick - cmake install must be after…
Browse files Browse the repository at this point in the history
… properties
  • Loading branch information
kyngchaos authored and nyalldawson committed Mar 17, 2020
1 parent e0d803c commit 97a6815
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/quickgui/CMakeLists.txt
Expand Up @@ -120,13 +120,6 @@ GENERATE_EXPORT_HEADER(
)

# Installation
INSTALL(TARGETS qgis_quick
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION ${QGIS_LIB_DIR}
ARCHIVE DESTINATION ${QGIS_LIB_DIR}
FRAMEWORK DESTINATION ${QGIS_FW_SUBDIR}
PUBLIC_HEADER DESTINATION ${QGIS_INCLUDE_DIR})

IF(NOT APPLE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qgis_quick.h ${QGIS_QUICK_GUI_HDRS} ${QGIS_QUICK_GUI_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
Expand All @@ -151,6 +144,13 @@ ELSE(NOT APPLE)
)
ENDIF(NOT APPLE)

INSTALL(TARGETS qgis_quick
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION ${QGIS_LIB_DIR}
ARCHIVE DESTINATION ${QGIS_LIB_DIR}
FRAMEWORK DESTINATION ${QGIS_FW_SUBDIR}
PUBLIC_HEADER DESTINATION ${QGIS_INCLUDE_DIR})

############################################################
# qgis_quick_plugin module (QML) library
ADD_SUBDIRECTORY(plugin)
Expand Down

0 comments on commit 97a6815

Please sign in to comment.