Add new headers to the install rules.

Also add a change to the cmake function generating the module pri files. They were only adding the Qt headers folder itself, which is a bit useless. It does now add the gammaray folder itself to the include path and also the old one. This allow gammaray headers (like probecontroller.h) having dependencies like: #include <common/...> to work correctly.
KDAB · Feb 11, 2016 · e466d03 · e466d03
1 parent 6828d59
commit e466d03
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/3rdparty/kde/CMakeLists.txt b/3rdparty/kde/CMakeLists.txt
@@ -24,7 +24,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayKItemModels
                       LIB_NAME gammaray_kitemmodels-${GAMMARAY_PROBE_ABI}
                       DEPS "core"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -60,7 +60,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayClient
                       LIB_NAME gammaray_client
                       DEPS "core gui widgets network GammaRayCommon GammaRayUi"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/cmake/ECMGeneratePriFile.cmake b/cmake/ECMGeneratePriFile.cmake
@@ -182,7 +182,7 @@ QT.${PRI_TARGET_BASENAME}.MINOR_VERSION = ${PROJECT_VERSION_MINOR}
 QT.${PRI_TARGET_BASENAME}.PATCH_VERSION = ${PROJECT_VERSION_PATCH}
 QT.${PRI_TARGET_BASENAME}.name = ${PRI_TARGET_LIBNAME}
 QT.${PRI_TARGET_BASENAME}.defines = ${PRI_TARGET_DEFINES}
-QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES}
+QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES} ${PRI_TARGET_INCLUDES}/..
 QT.${PRI_TARGET_BASENAME}.private_includes =
 QT.${PRI_TARGET_BASENAME}.libs = ${PRI_TARGET_LIBS}
 QT.${PRI_TARGET_BASENAME}.depends = ${PRI_TARGET_QTDEPS}

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -81,6 +81,7 @@ gammaray_install_headers(
   objectbroker.h
   objectmodel.h
   paths.h
+  probecontrollerinterface.h
   propertycontrollerinterface.h
   protocol.h
 )
@@ -89,7 +90,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayCommon
                       LIB_NAME gammaray_common-${GAMMARAY_PROBE_ABI}
                       DEPS "core gui network"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -147,6 +147,7 @@ gammaray_install_headers(
   objectmodelbase.h
   objecttypefilterproxymodel.h
   probeinterface.h
+  probecontroller.h
   propertycontroller.h
   propertycontrollerextension.h
   signalspycallbackset.h
@@ -160,7 +161,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayCore
                       LIB_NAME gammaray_core-${GAMMARAY_PROBE_ABI}
                       DEPS "core gui GammaRayCommon"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
@@ -67,7 +67,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayLauncher
                       LIB_NAME gammaray_launcher
                       DEPS "core gui GammaRayCommon"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})

diff --git a/probe/CMakeLists.txt b/probe/CMakeLists.txt
@@ -57,7 +57,7 @@ else()
                       LIB_NAME gammaray_probe-${GAMMARAY_PROBE_ABI}
                       DEPS "core gui network GammaRayCommon GammaRayCore"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..)
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
   install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gammaray_probe-android-dependencies.xml DESTINATION ${LIB_INSTALL_DIR})
 endif()
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
@@ -142,7 +142,7 @@ ecm_generate_pri_file(BASE_NAME GammaRayUi
                       LIB_NAME gammaray_ui-${GAMMARAY_PROBE_ABI}
                       DEPS "core gui widgets GammaRayCommon"
                       FILENAME_VAR PRI_FILENAME
-                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/..
+                      INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})