Fix issues with pri file.

Author: jacobly0

CMakeLists.txt

@@ -156,14 +156,21 @@ macro(set_compiler_flags targetName)
 
 endmacro()
 
+set(${PROJECT_NAME}_DEPS "widgets")
+
 if(${PROJECT_NAME}_QTQUICK)
   find_package(Qt${QT_MAJOR_VERSION}Quick)
   find_package(Qt${QT_MAJOR_VERSION}QuickControls2)
   add_definitions(-DKDDOCKWIDGETS_QTQUICK)
+  set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
 else()
   add_definitions(-DKDDOCKWIDGETS_QTWIDGETS)
 endif()
 
+if(NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ${PROJECT_NAME}_QT6)
+  set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} x11extras")
+endif()
+
 if(${PROJECT_NAME}_STATIC)
   set(${PROJECT_NAME}_LIBRARY_MODE "STATIC")
 else()
@@ -178,23 +185,25 @@ if(USE_DEFAULT_INSTALL_LOCATION)
   endif()
 endif()
 
+add_subdirectory(src)
+if(${PROJECT_NAME}_PYTHON_BINDINGS)
+  add_subdirectory(python)
+endif()
+
 # Generate .pri file for qmake users
 include(ECMGeneratePriFile)
 set(PROJECT_VERSION_STRING ${${PROJECT_NAME}_VERSION})
 ecm_generate_pri_file(BASE_NAME KDDockWidgets
   LIB_NAME kddockwidgets
+  DEPS ${${PROJECT_NAME}_DEPS}
   FILENAME_VAR pri_filename
+  INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}
 )
 install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
 
 install(FILES LICENSE.txt README.md DESTINATION ${INSTALL_DOC_DIR})
 install(DIRECTORY LICENSES DESTINATION ${INSTALL_DOC_DIR})
 
-add_subdirectory(src)
-if(${PROJECT_NAME}_PYTHON_BINDINGS)
-  add_subdirectory(python)
-endif()
-
 if(${PROJECT_NAME}_EXAMPLES)
   if (${PROJECT_NAME}_QTQUICK)
     add_subdirectory(examples/qtquick)

cmake/ECM/modules/ECMGeneratePriFile.cmake

@@ -160,14 +160,15 @@ function(ECM_GENERATE_PRI_FILE)
   else()
       set(PRI_TARGET_LIBS "${BASEPATH}/${EGPF_LIB_INSTALL_DIR}")
   endif()
-  set(PRI_TARGET_DEFINES "")
 
   set(PRI_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/qt_${PRI_TARGET_BASENAME}.pri)
   if (EGPF_FILENAME_VAR)
      set(${EGPF_FILENAME_VAR} ${PRI_FILENAME} PARENT_SCOPE)
   endif()
 
   set(PRI_TARGET_MODULE_CONFIG "")
+  set(PRI_TARGET_DEFINES "")
+  set(PRI_TARGET_POSTFIX "")
   # backward compat: it was not obvious LIB_NAME needs to be a target name,
   # and some projects where the target name was not the actual library output name
   # passed the output name for LIB_NAME, so .name & .module prperties are correctly set.
@@ -177,6 +178,10 @@ function(ECM_GENERATE_PRI_FILE)
     if (target_type STREQUAL "STATIC_LIBRARY")
         set(PRI_TARGET_MODULE_CONFIG "staticlib")
     endif()
+    get_target_property(target_defs ${EGPF_LIB_NAME} INTERFACE_COMPILE_DEFINITIONS)
+    list(FILTER target_defs EXCLUDE REGEX ^QT_)
+    string(JOIN " " PRI_TARGET_DEFINES "${target_defs}")
+    set(PRI_TARGET_POSTFIX "$<TARGET_PROPERTY:${EGPF_LIB_NAME},$<UPPER_CASE:$<CONFIG>$<$<CONFIG:>:Debug>>_POSTFIX>")
   endif()
 
   file(GENERATE
@@ -187,8 +192,8 @@ QT.${PRI_TARGET_BASENAME}.MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}
 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}.module = ${PRI_TARGET_LIBNAME}
-QT.${PRI_TARGET_BASENAME}.defines = ${PRI_TARGET_DEFINES}
+QT.${PRI_TARGET_BASENAME}.module = ${PRI_TARGET_LIBNAME}${PRI_TARGET_POSTFIX}
+QT.${PRI_TARGET_BASENAME}.DEFINES = ${PRI_TARGET_DEFINES}
 QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES}
 QT.${PRI_TARGET_BASENAME}.private_includes =
 QT.${PRI_TARGET_BASENAME}.libs = ${PRI_TARGET_LIBS}