diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-08-07 09:11:46 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-08-07 09:11:46 +0200 |
| commit | b8050c45f763651ce43c481ee3f862a2896cf265 (patch) | |
| tree | 2666bdc82c42d58151257313d8a5cbe41bf25c22 | |
| parent | 08289ff0e7457d75682390fc8e926f11f2386045 (diff) | |
| parent | 18ef0138e0857982835a1da262d53d2cce994261 (diff) | |
| download | qmenumodel-b8050c45f763651ce43c481ee3f862a2896cf265.tar.gz qmenumodel-b8050c45f763651ce43c481ee3f862a2896cf265.tar.bz2 qmenumodel-b8050c45f763651ce43c481ee3f862a2896cf265.zip | |
Merge branch 'tari01-pr/build-fixes'
Attributes GH PR #26: https://github.com/AyatanaIndicators/qmenumodel/pull/26
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | libqmenumodel/src/qmenumodel.pc.in | 2 | ||||
| -rw-r--r-- | tests/client/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e96cf8b..5b72d1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ -project(qmenumodel) -cmake_minimum_required(VERSION 3.13) -set (PROJECT_VERSION "0.9.1") +cmake_minimum_required (VERSION 3.13) +project (qmenumodel VERSION 0.9.1) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -58,9 +57,6 @@ if (ENABLE_TESTS) set(TEST_XML_OUTPUT OFF) else() add_subdirectory(tests) - if (ENABLE_COVERAGE) - find_package(CoverageReport) - endif() endif() endif() diff --git a/libqmenumodel/src/qmenumodel.pc.in b/libqmenumodel/src/qmenumodel.pc.in index 94fe217..d5a497a 100644 --- a/libqmenumodel/src/qmenumodel.pc.in +++ b/libqmenumodel/src/qmenumodel.pc.in @@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: qmenumodel Description: Qt binding for GMenuModel. -Version: @PROJECT_VERSION@ +Version: @CMAKE_PROJECT_VERSION@ Requires.private: Qt5Core Qt5Widgets gio-2.0 Libs: -L${libdir} -l@SHAREDLIBNAME@ diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 34bef38..05d31f3 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -73,7 +73,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmlfiles.h.in ${CMAKE_CURRENT_BINARY_DIR}/qmlfiles.h)
if (ENABLE_COVERAGE)
- enable_coverage_report(
+ find_package(CoverageReport)
+ ENABLE_COVERAGE_REPORT(
TARGETS
qmenumodel
FILTER
|