another header installation fix

qgis · Jan 5, 2017 · 7b17751 · 7b17751
1 parent fba097c
commit 7b17751
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/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
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -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)

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -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)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -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}
   )
-