Fix install for generated export headers

m-kuhn · m-kuhn · commit d88e7cae2e2f · 2017-01-05T17:10:32.000+01:00
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -212,7 +212,7 @@ GENERATE_EXPORT_HEADER(
    EXPORT_FILE_NAME qgis_analysis.h
  )
 
-SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${PROJECT_BINARY_DIR}/qgis_analysis.h)
+SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_analysis.h)
 
 
 # install
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -949,7 +949,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME qgis_core.h
 )
 
-SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${PROJECT_BINARY_DIR}/qgis_core.h)
+SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_core.h)
 
 IF(ENABLE_MODELTEST)
   TARGET_LINK_LIBRARIES(qgis_core ${QT_QTTEST_LIBRARY})
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -873,7 +873,7 @@ GENERATE_EXPORT_HEADER(
    EXPORT_FILE_NAME qgis_gui.h
 )
 
-SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${PROJECT_BINARY_DIR}/qgis_gui.h)
+SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h)
 
 IF(WIN32)
   ADD_DEFINITIONS(-DQWT_DLL)
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -39,7 +39,7 @@ GENERATE_EXPORT_HEADER(
  )
 
 INSTALL(FILES
-  ${PROJECT_BINARY_DIR}/qgis_python.h DESTINATION ${QGIS_INCLUDE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/qgis_python.h DESTINATION ${QGIS_INCLUDE_DIR}
 )
 
 IF (APPLE)

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ GENERATE_EXPORT_HEADER(`
`212`	`212`	`EXPORT_FILE_NAME qgis_analysis.h`
`213`	`213`	`)`
`214`	`214`
`215`		`-SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${PROJECT_BINARY_DIR}/qgis_analysis.h)`
	`215`	`+SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_analysis.h)`
`216`	`216`
`217`	`217`
`218`	`218`	`# install`
Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ GENERATE_EXPORT_HEADER(`
`949`	`949`	`EXPORT_FILE_NAME qgis_core.h`
`950`	`950`	`)`
`951`	`951`
`952`		`-SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${PROJECT_BINARY_DIR}/qgis_core.h)`
	`952`	`+SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_core.h)`
`953`	`953`
`954`	`954`	`IF(ENABLE_MODELTEST)`
`955`	`955`	`TARGET_LINK_LIBRARIES(qgis_core ${QT_QTTEST_LIBRARY})`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ GENERATE_EXPORT_HEADER(`
`873`	`873`	`EXPORT_FILE_NAME qgis_gui.h`
`874`	`874`	`)`
`875`	`875`
`876`		`-SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${PROJECT_BINARY_DIR}/qgis_gui.h)`
	`876`	`+SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h)`
`877`	`877`
`878`	`878`	`IF(WIN32)`
`879`	`879`	`ADD_DEFINITIONS(-DQWT_DLL)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ GENERATE_EXPORT_HEADER(`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`INSTALL(FILES`
`42`		`- ${PROJECT_BINARY_DIR}/qgis_python.h DESTINATION ${QGIS_INCLUDE_DIR}`
	`42`	`+ ${CMAKE_CURRENT_BINARY_DIR}/qgis_python.h DESTINATION ${QGIS_INCLUDE_DIR}`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`IF (APPLE)`