Skip to content
Permalink
Browse files

another header installation fix

  • Loading branch information
jef-n committed Jan 5, 2017
1 parent fba097c commit 7b17751f7114df69112f618190bb2fcb5e3b8eb5
Showing with 22 additions and 28 deletions.
  1. +8 −8 src/analysis/CMakeLists.txt
  2. +8 −8 src/gui/CMakeLists.txt
  3. +0 −4 src/python/CMakeLists.txt
  4. +6 −8 src/server/CMakeLists.txt
@@ -179,6 +179,14 @@ INCLUDE_DIRECTORIES(SYSTEM

ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})

GENERATE_EXPORT_HEADER(
qgis_analysis
BASE_NAME ANALYSIS
EXPORT_FILE_NAME qgis_analysis.h
)

SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_analysis.h)

IF(NOT APPLE)
INSTALL(FILES ${QGIS_ANALYSIS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
@@ -206,14 +214,6 @@ ENDIF (NOT ANDROID)

TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)

GENERATE_EXPORT_HEADER(
qgis_analysis
BASE_NAME ANALYSIS
EXPORT_FILE_NAME qgis_analysis.h
)

SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_analysis.h)


# install

@@ -833,6 +833,14 @@ ADD_LIBRARY(qgis_gui SHARED
${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS}
)

GENERATE_EXPORT_HEADER(
qgis_gui
BASE_NAME GUI
EXPORT_FILE_NAME qgis_gui.h
)

SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h)

IF(NOT APPLE)
INSTALL(FILES ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
@@ -867,14 +875,6 @@ TARGET_LINK_LIBRARIES(qgis_gui
${QSCINTILLA_LIBRARY}
)

GENERATE_EXPORT_HEADER(
qgis_gui
BASE_NAME GUI
EXPORT_FILE_NAME qgis_gui.h
)

SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h)

IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
ADD_DEFINITIONS(-DQSCINTILLA_DLL)
@@ -38,10 +38,6 @@ GENERATE_EXPORT_HEADER(
EXPORT_FILE_NAME qgis_python.h
)

INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/qgis_python.h DESTINATION ${QGIS_INCLUDE_DIR}
)

IF (APPLE)
SET_TARGET_PROPERTIES(qgispython PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF (APPLE)
@@ -112,6 +112,12 @@ ENDIF(MSVC)

ADD_LIBRARY(qgis_server SHARED ${qgis_mapserv_SRCS} ${qgis_mapserv_MOC_SRCS} ${qgis_mapserv_HDRS} ${qgis_mapserv_MOC_HDRS})

GENERATE_EXPORT_HEADER(
qgis_server
BASE_NAME SERVER
EXPORT_FILE_NAME qgis_server.h
)

#generate unversioned libs for android
IF (NOT ANDROID)
SET_TARGET_PROPERTIES(qgis_server PROPERTIES
@@ -222,13 +228,6 @@ TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
${QCA_LIBRARY}
)

GENERATE_EXPORT_HEADER(
qgis_server
BASE_NAME SERVER
EXPORT_FILE_NAME qgis_server.h
)

SET(QGIS_SERVER_HDRS ${QGIS_SERVER_HDRS} ${PROJECT_BINARY_DIR}/qgis_server.h)

########################################################
# Install
@@ -244,4 +243,3 @@ INSTALL(FILES
schemaExtension.xsd
DESTINATION ${QGIS_CGIBIN_DIR}
)

0 comments on commit 7b17751

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