Commit daa6bcd2 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Revert "Use proper way of adding Boost include dirs to install interface"

Does not work correctly with all reasonably-recent version of CMake and boost,
let's try to figure out something better...

This reverts commit 65689f19.
parent 65689f19
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.0)
set(PIM_VERSION "5.7.40")
project(Akonadi VERSION ${PIM_VERSION})
......@@ -72,7 +72,7 @@ find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG)
set_package_properties(KF5DesignerPlugin PROPERTIES DESCRIPTION "KF5 designer plugin" TYPE OPTIONAL)
set(Boost_MINIMUM_VERSION "1.34.0")
find_package(Boost ${Boost_MINIMUM_VERSION} REQUIRED COMPONENTS graph)
find_package(Boost ${Boost_MINIMUM_VERSION})
set_package_properties(Boost PROPERTIES
DESCRIPTION "Boost C++ Libraries"
URL "http://www.boost.org"
......
......@@ -47,7 +47,7 @@ generate_export_header(KF5AkonadiAgentBase BASE_NAME akonadiagentbase)
add_library(KF5::AkonadiAgentBase ALIAS KF5AkonadiAgentBase)
target_include_directories(KF5AkonadiAgentBase INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiAgentBase>")
target_include_directories(KF5AkonadiAgentBase INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiAgentBase;${Boost_INCLUDE_DIR}>")
target_link_libraries(KF5AkonadiAgentBase
PUBLIC
......
......@@ -282,9 +282,10 @@ add_library(KF5AkonadiCore ${akonadicore_SRCS})
generate_export_header(KF5AkonadiCore BASE_NAME akonadicore)
add_library(KF5::AkonadiCore ALIAS KF5AkonadiCore)
target_include_directories(KF5AkonadiCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiCore>")
target_include_directories(KF5AkonadiCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiCore;${Boost_INCLUDE_DIR}>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Akonadi_SOURCE_DIR}/src/core;${Akonadi_BINARY_DIR}/src/core;${Akonadi_BINARY_DIR}/src/private>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Akonadi_BINARY_DIR};${Akonadi_SOURCE_DIR}/src/core/jobs;${Akonadi_SOURCE_DIR}/src/core/models>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>")
kde_target_enable_exceptions(KF5AkonadiCore PUBLIC)
......@@ -293,7 +294,6 @@ PUBLIC
KF5::CoreAddons # for KJob
KF5::ItemModels
Qt5::Gui # for QColor
Boost::boost
PRIVATE
Qt5::Network
Qt5::Widgets
......
......@@ -87,7 +87,7 @@ generate_export_header(KF5AkonadiWidgets BASE_NAME akonadiwidgets)
add_library(KF5::AkonadiWidgets ALIAS KF5AkonadiWidgets)
target_include_directories(KF5AkonadiWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiWidgets>")
target_include_directories(KF5AkonadiWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiWidgets;${Boost_INCLUDE_DIR}>")
target_link_libraries(KF5AkonadiWidgets
PUBLIC
......
Markdown is supported
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