Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

.github/workflows/linux-builds.yml

@@ -1,4 +1,4 @@
-name: linux-builds
+ilds
 
 on: [push]
 
@@ -26,14 +26,22 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
+    - name: Cache Qt
+      id: cache-qt-6-4
+      uses: actions/cache@v1  # not v2!
+      with:
+        path: ../Qt/6.4.2
+        key: ${{ runner.os }}-QtCache-Qt6-4
+
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
       with:
-        version: 6.4.2
+        version: '6.4.2'
-        host: linux
+        host: 'linux'
-        target: desktop
+        target: 'desktop'
         install-deps: true
-        setup-python: false
+        cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
+        setup-python: true
         tools: ''
         tools-only: false
 
@@ -48,4 +56,4 @@ jobs:
     - name: qmake
       run: qmake
     - name: make
-      run: make -j$(nproc)
+      run: make -j$(nproc)

demo/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::Co
 if(WIN32 AND QT_VERSION_MAJOR LESS 6)
     target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::AxContainer)
 endif()
-target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking)
+target_link_libraries(AdvancedDockingSystemDemo PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 set_target_properties(AdvancedDockingSystemDemo PROPERTIES 
     AUTOMOC ON
     AUTORCC ON

examples/autohide/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(AutoHideExample WIN32
     mainwindow.ui
 )
 target_include_directories(AutoHideExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(AutoHideExample PRIVATE qtadvanceddocking)
+target_link_libraries(AutoHideExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(AutoHideExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                   Qt${QT_VERSION_MAJOR}::Gui 
                                                   Qt${QT_VERSION_MAJOR}::Widgets)

examples/centralwidget/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(CentralWidgetExample WIN32
     mainwindow.ui
 )
 target_include_directories(CentralWidgetExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(CentralWidgetExample PRIVATE qtadvanceddocking)
+target_link_libraries(CentralWidgetExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(CentralWidgetExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                   Qt${QT_VERSION_MAJOR}::Gui 
                                                   Qt${QT_VERSION_MAJOR}::Widgets)

examples/deleteonclose/CMakeLists.txt

@@ -7,7 +7,7 @@ add_executable(DeleteOnCloseTest WIN32
     main.cpp
 )
 target_include_directories(DeleteOnCloseTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(DeleteOnCloseTest PRIVATE qtadvanceddocking)
+target_link_libraries(DeleteOnCloseTest PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(DeleteOnCloseTest PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                Qt${QT_VERSION_MAJOR}::Gui 
                                                Qt${QT_VERSION_MAJOR}::Widgets)

examples/dockindock/CMakeLists.txt

@@ -12,7 +12,7 @@ add_executable(DockInDockExample WIN32
     mainframe.cpp
 )
 target_include_directories(DockInDockExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(DockInDockExample PRIVATE qtadvanceddocking)
+target_link_libraries(DockInDockExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(DockInDockExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                            Qt${QT_VERSION_MAJOR}::Gui 
                                            Qt${QT_VERSION_MAJOR}::Widgets)

examples/emptydockarea/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(EmptyDockAreaExample WIN32
     mainwindow.ui
 )
 target_include_directories(EmptyDockAreaExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(EmptyDockAreaExample PRIVATE qtadvanceddocking)
+target_link_libraries(EmptyDockAreaExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(EmptyDockAreaExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                   Qt${QT_VERSION_MAJOR}::Gui 
                                                   Qt${QT_VERSION_MAJOR}::Widgets)

examples/hideshow/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(HideShowExample WIN32
     MainWindow.ui
 )
 target_include_directories(HideShowExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(HideShowExample PRIVATE qtadvanceddocking)
+target_link_libraries(HideShowExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(HideShowExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                              Qt${QT_VERSION_MAJOR}::Gui 
                                              Qt${QT_VERSION_MAJOR}::Widgets)

examples/sidebar/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(SidebarExample WIN32
     MainWindow.ui
 )
 target_include_directories(SidebarExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(SidebarExample PRIVATE qtadvanceddocking)
+target_link_libraries(SidebarExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(SidebarExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                             Qt${QT_VERSION_MAJOR}::Gui 
                                             Qt${QT_VERSION_MAJOR}::Widgets)

examples/simple/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(SimpleExample WIN32
     MainWindow.ui
 )
 target_include_directories(SimpleExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(SimpleExample PRIVATE qtadvanceddocking)
+target_link_libraries(SimpleExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(SimpleExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                            Qt${QT_VERSION_MAJOR}::Gui 
                                            Qt${QT_VERSION_MAJOR}::Widgets)

setup.cfg

@@ -1,7 +0,0 @@
-[versioneer]
-VCS = git
-style = pep440
-versionfile_source = PyQtAds/_version.py
-versionfile_build  = PyQtAds/_version.py
-tag_prefix =
-

setup.py

@@ -1,396 +0,0 @@
-import os
-import sys
-import shlex
-import shutil
-import subprocess
-import glob
-
-import versioneer
-
-from setuptools import setup, find_packages
-from setuptools.command.build_py import build_py
-from setuptools.extension import Extension
-from distutils import sysconfig, dir_util, spawn, log, cmd
-from distutils.dep_util import newer
-import sipdistutils
-import sipconfig
-from PyQt5.QtCore import PYQT_CONFIGURATION
-from PyQt5.pyrcc_main import processResourceFile
-
-MODULE_NAME = "ads"
-SRC_PATH = "PyQtAds"
-
-REQUIRE_PYQT = True
-if "--conda-recipe" in sys.argv:
-    REQUIRE_PYQT = False
-    sys.argv.remove("--conda-recipe")
-
-
-class HostPythonConfiguration(object):
-    def __init__(self):
-        self.platform = sys.platform
-        self.version = sys.hexversion>>8
-
-        self.inc_dir = sysconfig.get_python_inc()
-        self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
-        self.module_dir = sysconfig.get_python_lib(plat_specific=1)
-
-        if sys.platform == 'win32':
-            self.data_dir = sys.prefix
-            self.lib_dir = sys.prefix +'\\libs'
-        else:
-            self.data_dir = sys.prefix + '/share'
-            self.lib_dir = sys.prefix + '/lib'
-
-
-class TargetQtConfiguration(object):
-    def __init__(self, qmake):
-        pipe = os.popen(' '.join([qmake, '-query']))
-
-        for l in pipe:
-            l = l.strip()
-
-            tokens = l.split(':', 1)
-            if isinstance(tokens, list):
-                if len(tokens) != 2:
-                    error("Unexpected output from qmake: '%s'\n" % l)
-
-                name, value = tokens
-            else:
-                name = tokens
-                value = None
-
-            name = name.replace('/', '_')
-            setattr(self, name, value)
-
-        pipe.close()
-
-
-class build_ext(sipdistutils.build_ext):
-
-    description = "Builds the " + MODULE_NAME + " module."
-
-    user_options = sipdistutils.build_ext.user_options + [
-        ('qmake-bin=', None, "Path to qmake binary"),
-        ('sip-bin=', None, "Path to sip binary"),
-        ('qt-include-dir=', None, "Path to Qt headers"),
-        ('pyqt-sip-dir=', None, "Path to PyQt's SIP files"),
-        ('pyqt-sip-flags=', None, "SIP flags used to generate PyQt bindings"),
-        ('sip-dir=', None, "Path to module's SIP files"),
-        ('inc-dir=', None, "Path to module's include files")
-    ]
-
-    def initialize_options (self):
-        super().initialize_options()
-        self.qmake_bin = 'qmake'
-        self.sip_bin = None
-        self.qt_include_dir = None
-        self.qt_libinfix = ''
-        self.pyqt_sip_dir = None
-        self.pyqt_sip_flags = None
-        self.sip_files_dir = None
-        self.sip_inc_dir = None
-        self.inc_dir = None
-        self.pyconfig = HostPythonConfiguration()
-        self.qtconfig = TargetQtConfiguration(self.qmake_bin)
-        self.config = sipconfig.Configuration()
-        self.config.default_mod_dir = ("/usr/local/lib/python%i.%i/dist-packages" %
-                                      (sys.version_info.major, sys.version_info.minor))
-
-    def finalize_options (self):
-        super().finalize_options()
-
-        if not self.qt_include_dir:
-            self.qt_include_dir = self.qtconfig.QT_INSTALL_HEADERS
-
-        if not self.qt_libinfix:
-            try:
-                with open(os.path.join(self.qtconfig.QT_INSTALL_PREFIX, 'mkspecs', 'qconfig.pri'), 'r') as f:
-                    for line in f.readlines():
-                        if line.startswith('QT_LIBINFIX'):
-                            self.qt_libinfix = line.split('=')[1].strip('\n').strip()
-            except (FileNotFoundError, IndexError):
-                pass
-
-        if not self.pyqt_sip_dir:
-            self.pyqt_sip_dir = os.path.join(self.pyconfig.data_dir, 'sip', 'PyQt5')
-
-        if not self.pyqt_sip_flags:
-            self.pyqt_sip_flags = PYQT_CONFIGURATION.get('sip_flags', '')
-
-        if not self.sip_files_dir:
-            self.sip_files_dir = os.path.abspath(os.path.join(".", "sip"))
-
-        if not self.sip_inc_dir:
-            self.sip_inc_dir = self.pyconfig.venv_inc_dir
-
-        if not self.inc_dir:
-            self.inc_dir = os.path.abspath(os.path.join(".", "src"))
-
-        if not self.qt_include_dir:
-            raise SystemExit('Could not find Qt5 headers. '
-                             'Please specify via --qt-include-dir=')
-
-        if not self.pyqt_sip_dir:
-            raise SystemExit('Could not find PyQt SIP files. '
-                             'Please specify containing directory via '
-                             '--pyqt-sip-dir=')
-
-        if not self.pyqt_sip_flags:
-            raise SystemExit('Could not find PyQt SIP flags. '
-                             'Please specify via --pyqt-sip-flags=')
-
-    def _find_sip(self):
-        """override _find_sip to allow for manually speficied sip path."""
-        
-        # 1. Manually specified sip_bin
-        if self.sip_bin:
-            return self.sip_bin
-
-        # 2. Path determined from sipconfig.Configuration()
-        #    This may not exist, depending on conda build configuration.
-        sip_bin = super()._find_sip()
-        if os.path.exists(sip_bin):
-            return sip_bin
-
-        # 3. Finally, fall back to sip binary found in path
-        sip_bin = shutil.which('sip')
-        if sip_bin:
-            return sip_bin
-
-        raise SystemExit('Could not find PyQt SIP binary.')
-        
-    def _sip_sipfiles_dir(self):
-        sip_dir = super()._sip_sipfiles_dir()
-        if os.path.exists(sip_dir):
-            return sip_dir
-        
-        return os.path.join(sys.prefix, 'sip', 'PyQt5')
-
-    def _sip_compile(self, sip_bin, source, sbf):
-        target_dir = os.path.dirname(__file__) if self.inplace else self.build_lib
-        pyi = os.path.join(target_dir, "PyQtAds", "QtAds", "ads.pyi")
-        if not os.path.exists(os.path.dirname(pyi)):
-            os.makedirs(os.path.dirname(pyi))
-        
-        cmd = [sip_bin]
-        if hasattr(self, 'sip_opts'):
-            cmd += self.sip_opts
-        if hasattr(self, '_sip_sipfiles_dir'):
-            cmd += ['-I', self._sip_sipfiles_dir()]
-        cmd += [
-            "-I", self.sip_files_dir,
-            "-I", self.pyqt_sip_dir,
-            "-I", self.sip_inc_dir,
-            "-I", self.inc_dir,
-            "-c", self._sip_output_dir(),
-            "-b", sbf,
-            "-y", pyi,
-            "-w", "-o"]
-
-        cmd += shlex.split(self.pyqt_sip_flags)  # use same SIP flags as for PyQt5
-        cmd.append(source)
-        self.spawn(cmd)
-        
-        if os.path.exists(pyi):
-            with open(pyi) as f:
-                content = f.readlines()
-            with open(pyi, "w") as f:
-                for line in content:
-                    if not line.startswith("class ads"):
-                        f.write(line)
-
-    def swig_sources (self, sources, extension=None):
-        if not self.extensions:
-            return
-
-        # Add the local include directory to the include path
-        if extension is not None:
-            extension.extra_compile_args += ['-D', 'QT_CORE_LIB',
-                                             '-D', 'QT_GUI_LIB',
-                                             '-D', 'QT_WIDGETS_LIB',
-                                             '-D', 'ADS_SHARED_EXPORT']
-            extension.include_dirs += [self.qt_include_dir, self.inc_dir,
-                            os.path.join(self.qt_include_dir, 'QtCore'),
-                            os.path.join(self.qt_include_dir, 'QtGui'),
-                            os.path.join(self.qt_include_dir, 'QtWidgets')]
-            extension.libraries += ['Qt5Core' + self.qt_libinfix,
-                                    'Qt5Gui' + self.qt_libinfix,
-                                    'Qt5Widgets' + self.qt_libinfix]
-
-            if sys.platform == 'win32':
-                extension.library_dirs += [self.qtconfig.QT_INSTALL_LIBS,
-                                       self.inc_dir, self._sip_output_dir()]
-            elif sys.platform == 'darwin':
-                extension.extra_compile_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
-                    '-std=c++11', '-stdlib=libc++', '-mmacosx-version-min=10.9']
-                extension.extra_link_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
-                    '-mmacosx-version-min=10.9']
-            elif sys.platform == 'linux':
-                extension.extra_compile_args += ['-std=c++11']
-
-        return super().swig_sources(sources, extension)
-
-    def build_extension(self, ext):        
-        cppsources = [source for source in ext.sources if source.endswith(".cpp")]
-        headersources = ['src/DockAreaTitleBar_p.h']
-
-        dir_util.mkpath(self.build_temp, dry_run=self.dry_run)
-
-        def get_moc_args(out_file, source):
-            if sys.platform.startswith('linux'):
-                return ["moc", "-D", "Q_OS_LINUX=1", "-o", out_file, source]
-            if sys.platform.startswith('darwin'):
-                return ["moc", "-D", "Q_OS_MACOS=1", "-o", out_file, source]
-            if sys.platform.startswith('win'):
-                return ["moc", "-D", "Q_OS_WIN=1", "-o", out_file, source]
-            return ["moc", "-o", out_file, source]
-
-        # Run moc on all header files.
-        for source in cppsources:
-            # *.cpp -> *.moc
-            moc_file = os.path.basename(source).replace(".cpp", ".moc")
-            out_file = os.path.join(self.build_temp, moc_file)
-
-            if newer(source, out_file) or self.force:
-                spawn.spawn(get_moc_args(out_file, source), dry_run=self.dry_run)
-
-            header = source.replace(".cpp", ".h")
-            if os.path.exists(header):
-                # *.h -> moc_*.cpp
-                moc_file = "moc_" + os.path.basename(header).replace(".h", ".cpp")
-                out_file = os.path.join(self.build_temp, moc_file)
-
-                if newer(header, out_file) or self.force:
-                    spawn.spawn(get_moc_args(out_file, header), dry_run=self.dry_run)
-
-                if os.path.getsize(out_file) > 0:
-                    ext.sources.append(out_file)
-
-        # Run moc on all orphan header files.
-        for source in headersources:
-            # *.cpp -> *.moc
-            moc_file = os.path.basename(source).replace(".h", ".moc")
-            out_file = os.path.join(self.build_temp, moc_file)
-
-            if newer(source, out_file) or self.force:
-                spawn.spawn(get_moc_args(out_file, source),
-                            dry_run=self.dry_run)
-
-            header = source
-            if os.path.exists(header):
-                # *.h -> moc_*.cpp
-                moc_file = "moc_" + os.path.basename(header).replace(
-                    ".h", ".cpp")
-                out_file = os.path.join(self.build_temp, moc_file)
-
-                if newer(header, out_file) or self.force:
-                    spawn.spawn(get_moc_args(out_file, header),
-                                dry_run=self.dry_run)
-
-                if os.path.getsize(out_file) > 0:
-                    ext.sources.append(out_file)
-
-        # Add the temp build directory to include path, for compiler to find
-        # the created .moc files
-        ext.include_dirs += [self._sip_output_dir()]
-        
-        # Run rcc on all resource files
-        resources = [source for source in ext.sources if source.endswith(".qrc")]
-        for source in resources:
-            ext.sources.remove(source)
-            out_file = os.path.join(self.build_temp, "qrc_" + os.path.basename(source).replace(".qrc", ".cpp"))
-            if newer(header, out_file) or self.force:
-                spawn.spawn(["rcc", "-name", os.path.splitext(os.path.basename(source))[0], source, "-o", out_file], dry_run=self.dry_run)
-
-            if os.path.getsize(out_file) > 0:
-                ext.sources.append(out_file)
-
-        sipdistutils.build_ext.build_extension(self, ext)
-        
-        import inspect
-        sys.path.append(os.path.join(self.build_lib, 'PyQtAds', 'QtAds'))
-        import ads
-
-        with open(os.path.join(self.build_lib, 'PyQtAds', 'QtAds', '__init__.py'), 'w') as f:
-            f.write('from .._version import *\n')
-            f.write('from .ads import ads\n')
-            for name, member in sorted(inspect.getmembers(ads.ads)):
-                if not name.startswith('_'):
-                    f.write('{0} = ads.{0}\n'.format(name))
-
-
-class ProcessResourceCommand(cmd.Command):
-    """A custom command to compile the resource file into a Python file"""
-
-    description = "Compile the qrc file into a python file"
-
-    def initialize_options(self):
-        return
-
-    def finalize_options(self):
-        return
-
-    def run(self):
-        processResourceFile([os.path.join('src', 'ads.qrc')],
-                            os.path.join(SRC_PATH, 'rc.py'), False)
-
-
-class BuildPyCommand(build_py):
-    """Custom build command to include ProcessResource command"""
-
-    def run(self):
-        self.run_command("process_resource")
-        build_py.run(self)
-
-
-setup_requires = ["PyQt5"] if REQUIRE_PYQT else []
-cpp_sources = glob.glob(os.path.join('src', '*.cpp'))
-sip_sources = [os.path.join('sip', MODULE_NAME + '.sip')]
-resources = [os.path.join('src', MODULE_NAME + '.qrc')]
-if sys.platform == 'linux':
-    cpp_sources += glob.glob(os.path.join('src', 'linux', '*.cpp'))
-ext_modules = [Extension('PyQtAds.QtAds.ads', cpp_sources + sip_sources + resources)]
-
-install_requires = ["PyQt5"]
-if sys.platform == 'win32':
-    install_requires.append("pywin32")
-
-
-with open('README.md', 'r') as f:
-    LONG_DESCRIPTION = f.read()
-
-setup(
-    name = SRC_PATH,
-    author = "Nicolas Elie",
-    author_email = "nicolas.elie@cnrs.fr",
-    url = "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
-    version = versioneer.get_version(),
-    description = "Advanced Docking System for Qt",
-    long_description = LONG_DESCRIPTION,
-    keywords = ["qt"],
-    license = "LGPLv2+",
-    classifiers = ["Development Status :: 4 - Beta",
-                   "Intended Audience :: Developers",
-                   "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
-                   "Operating System :: OS Independent",
-                   "Topic :: Software Development :: Libraries :: Python Modules",
-                   "Environment :: Win32 (MS Windows)",
-                   "Environment :: MacOS X",
-                   "Environment :: X11 Applications :: Qt",
-                   "Programming Language :: Python :: 3",
-                   "Programming Language :: Python :: 3.2",
-                   "Programming Language :: Python :: 3.3",
-                   "Programming Language :: Python :: 3.4",
-                   "Programming Language :: Python :: 3.5",
-                   "Programming Language :: Python :: 3.6",
-                   "Programming Language :: Python :: 3.7"],
-    ext_modules = ext_modules,
-    cmdclass = versioneer.get_cmdclass({'process_resource': ProcessResourceCommand,
-                                        'build_py': BuildPyCommand,
-                                        'build_ext': build_ext}),
-    packages = find_packages(),
-    setup_requires = setup_requires,
-    install_requires = install_requires,
-    zip_safe=False
-)

src/CMakeLists.txt

@@ -64,50 +64,52 @@ if (UNIX AND NOT APPLE)
     set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
     set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
 endif()
+
+set(library_name "qt${QT_VERSION_MAJOR}advanceddocking")
 if(BUILD_STATIC)
-    add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
+    add_library(${library_name} STATIC ${ads_SRCS} ${ads_HEADERS})
-    target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
+    target_compile_definitions( ${library_name} PUBLIC ADS_STATIC)
 else()
-    add_library(qtadvanceddocking SHARED ${ads_SRCS} ${ads_HEADERS})
+    add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS})
-    target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
+    target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT)
 endif()
 
-add_library(ads::qtadvanceddocking ALIAS qtadvanceddocking)
+add_library(ads::${library_name} ALIAS ${library_name})
 
-target_link_libraries(qtadvanceddocking PUBLIC Qt${QT_VERSION_MAJOR}::Core 
+target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                Qt${QT_VERSION_MAJOR}::Gui 
                                                Qt${QT_VERSION_MAJOR}::Widgets)
 if (UNIX AND NOT APPLE)
-  target_link_libraries(qtadvanceddocking PUBLIC xcb)
+  target_link_libraries(${library_name} PUBLIC xcb)
 endif()
-set_target_properties(qtadvanceddocking PROPERTIES
+set_target_properties(${library_name} PROPERTIES
     AUTOMOC ON
     AUTORCC ON
     CXX_EXTENSIONS OFF
     VERSION ${VERSION_SHORT}
-    EXPORT_NAME "qtadvanceddocking"
+    EXPORT_NAME ${library_name}
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
 )
 if(QT_VERSION_MAJOR STREQUAL "5")
-    set_target_properties(qtadvanceddocking PROPERTIES
+    set_target_properties(${library_name} PROPERTIES
         CXX_STANDARD 14
         CXX_STANDARD_REQUIRED ON)
 elseif(QT_VERSION_MAJOR STREQUAL "6")
-    set_target_properties(qtadvanceddocking PROPERTIES
+    set_target_properties(${library_name} PROPERTIES
         CXX_STANDARD 17
         CXX_STANDARD_REQUIRED ON)
 endif()
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
-    "qtadvanceddockingConfigVersion.cmake"
+    "${library_name}ConfigVersion.cmake"
     VERSION ${VERSION_SHORT}
     COMPATIBILITY SameMajorVersion
 )
 install(FILES ${ads_HEADERS}
-    DESTINATION include
+    DESTINATION include/${library_name}
     COMPONENT headers
 )
 install(FILES
@@ -116,7 +118,7 @@ install(FILES
     DESTINATION license/ads
     COMPONENT license
 )
-install(TARGETS qtadvanceddocking
+install(TARGETS ${library_name}
     EXPORT adsTargets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
@@ -127,13 +129,16 @@ install(TARGETS qtadvanceddocking
 install(EXPORT adsTargets
     FILE adsTargets.cmake
     NAMESPACE ads::
-    DESTINATION lib/cmake/qtadvanceddocking
+    DESTINATION lib/cmake/${library_name}
 )
-install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvanceddockingConfigVersion.cmake"
+install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake
-    DESTINATION lib/cmake/qtadvanceddocking
+    DESTINATION lib/cmake/${library_name}
+)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake"
+    DESTINATION lib/cmake/${library_name}
 )
 
-target_include_directories(qtadvanceddocking PUBLIC
+target_include_directories(${library_name} PUBLIC
     $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )