Fix install for generated export headers

qgis · Jan 5, 2017 · d88e7ca · d88e7ca
1 parent b1e226c
commit d88e7ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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)