Commit 4d3fcb76 authored by Andrius Štikonas's avatar Andrius Štikonas
Browse files

Merge branch 'release/20.12'

parents 9d4ab0e6 6e8424be
......@@ -84,8 +84,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
pkg_check_modules(BLKID REQUIRED blkid>=${BLKID_MIN_VERSION})
endif()
include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
add_subdirectory(src)
# create a Config.cmake and a ConfigVersion.cmake file and install them
......
......@@ -5,5 +5,8 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(Qt5Core @QT_MIN_VERSION@)
set_and_check(KPMCORE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
include("${CMAKE_CURRENT_LIST_DIR}/KPMcoreTargets.cmake")
......@@ -6,6 +6,10 @@
add_definitions(-DTRANSLATION_DOMAIN=\"kpmcore\")
include_directories(
${BLKID_INCLUDE_DIRS}
)
include(backend/CMakeLists.txt)
include(core/CMakeLists.txt)
include(util/CMakeLists.txt)
......@@ -37,6 +41,11 @@ target_link_libraries( kpmcore PUBLIC
KF5::CoreAddons
KF5::WidgetsAddons
)
generate_export_header(kpmcore
BASE_NAME LIBKPMCORE
EXPORT_FILE_NAME util/libpartitionmanagerexport.h
)
list(APPEND UTIL_LIB_HDRS ${CMAKE_CURRENT_BINARY_DIR}/util/libpartitionmanagerexport.h)
install(TARGETS kpmcore EXPORT KPMcoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CORE_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/kpmcore/core/ COMPONENT Devel)
......
......@@ -36,7 +36,6 @@ set(UTIL_SRC
)
set(UTIL_LIB_HDRS
util/libpartitionmanagerexport.h
util/capacity.h
util/externalcommand.h
util/globallog.h
......
/*
SPDX-FileCopyrightText: 2008 Volker Lanz <vl@fidra.de>
SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas <andrius@stikonas.eu>
SPDX-FileCopyrightText: 2015 Chris Campbell <c.j.campbell@ed.ac.uk>
SPDX-License-Identifier: GPL-3.0-or-later
*/
#ifndef LIBKPMCORE_EXPORT
#include <QtGlobal>
#define LIBKPMCORE_EXPORT Q_DECL_EXPORT
#endif
......@@ -14,7 +14,6 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
include_directories(${CMAKE_SOURCE_DIR}/src) # To get at KPMcore headers
add_compile_options(-fPIC)
###
......@@ -23,7 +22,7 @@ add_compile_options(-fPIC)
# and to add a test with the given name.
#
add_library(testhelpers STATIC helpers.cpp)
target_link_libraries(testhelpers)
target_link_libraries(testhelpers PRIVATE kpmcore)
macro (kpm_test name)
add_executable(${name} ${ARGN})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment