Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: "6.8.2"
version: "6.10.1"
host: linux
target: desktop
arch: linux_gcc_64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: "6.8.2"
version: "6.10.1"
host: mac
target: desktop
arch: clang_64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: "6.8.2"
version: "6.10.1"
host: windows
target: desktop
arch: win64_msvc2022_64
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v1.3.2

- Update CMake configuration to use GNUInstallDirs for standard installation paths.
- Update export and install commands to use project namespace.
- Fix compatibility with Qt6 < 6.4.

## v1.3.1

- Remove `#pragma region` and `#pragma endregion` comments.
Expand Down
15 changes: 13 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# Set project information.
project("QtAppInstanceManager"
LANGUAGES CXX
VERSION 1.3.1.0
VERSION 1.3.2.0
DESCRIPTION "A tool to communicate between the instances of your Qt application."
HOMEPAGE_URL "https://github.com/oclero/QtAppInstanceManager"
)
Expand All @@ -26,9 +26,20 @@ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

# Include GNUInstallDirs for standard installation paths.
include(GNUInstallDirs)

# Find Qt.
find_package(Qt6 REQUIRED COMPONENTS Core Network)
qt_standard_project_setup()

# qt_standard_project_setup() is only available in Qt >= 6.3.
if(COMMAND qt_standard_project_setup)
qt_standard_project_setup()
else()
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
endif()

# The library.
add_subdirectory(src)
Expand Down
33 changes: 9 additions & 24 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@
"displayName": "macOS",
"configurePreset": "macos",
"description": "Release build for macOS",
"targets": [
"QtAppInstanceManager"
],
"targets": ["QtAppInstanceManager"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -78,9 +76,7 @@
"displayName": "Tests for macOS",
"configurePreset": "macos",
"description": "Tests release build for macOS",
"targets": [
"QtAppInstanceManagerTests"
],
"targets": ["QtAppInstanceManagerTests"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -93,9 +89,7 @@
"displayName": "Windows",
"configurePreset": "windows",
"description": "Release build for Windows",
"targets": [
"QtAppInstanceManager"
],
"targets": ["QtAppInstanceManager"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -108,9 +102,7 @@
"displayName": "Tests for Windows",
"configurePreset": "windows",
"description": "Tests release build for Windows",
"targets": [
"QtAppInstanceManagerTests"
],
"targets": ["QtAppInstanceManagerTests"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -123,9 +115,7 @@
"displayName": "Linux",
"configurePreset": "linux",
"description": "Release build for Linux",
"targets": [
"QtAppInstanceManager"
],
"targets": ["QtAppInstanceManager"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -138,9 +128,7 @@
"displayName": "Tests for Linux",
"configurePreset": "linux",
"description": "Tests release build for Linux",
"targets": [
"QtAppInstanceManagerTests"
],
"targets": ["QtAppInstanceManagerTests"],
"configuration": "Release",
"condition": {
"type": "equals",
Expand All @@ -159,8 +147,7 @@
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": false,
"rerun-failed": true
"stopOnFailure": false
},
"condition": {
"type": "equals",
Expand All @@ -177,8 +164,7 @@
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": false,
"rerun-failed": true
"stopOnFailure": false
},
"condition": {
"type": "equals",
Expand All @@ -195,8 +181,7 @@
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": false,
"rerun-failed": true
"stopOnFailure": false
},
"condition": {
"type": "equals",
Expand Down
2 changes: 1 addition & 1 deletion cmake/config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
include(CMakeFindDependencyMacro)

find_dependency(Qt6 REQUIRED COMPONENTS Core Widgets Svg)
find_dependency(Qt6 REQUIRED COMPONENTS Core Network)

check_required_components(@PROJECT_NAME@)
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/"

install(EXPORT "${PROJECT_NAME}Targets"
FILE "${PROJECT_NAME}Targets.cmake"
NAMESPACE ${PROJECT_NAME}::
NAMESPACE ${PROJECT_NAMESPACE}::
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)

Expand All @@ -100,5 +100,5 @@ install(FILES

export(EXPORT "${PROJECT_NAME}Targets"
FILE "${CMAKE_BINARY_DIR}/cmake/${PROJECT_NAME}Targets.cmake"
NAMESPACE ${PROJECT_NAME}::
NAMESPACE ${PROJECT_NAMESPACE}::
)
Loading