Commit 7b4edffe authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Volker/Hannah fixed building on windows

Revert "Disable kitinerary on windows as it doesn't build yet"

This reverts commit 84ebe12c.
parent 235068e5
Pipeline #40756 canceled with stage
......@@ -122,10 +122,7 @@ find_package(KF5ContactEditor ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimImportWizard ${IMPORTWIZARD_LIB_VERSION} CONFIG)
find_package(KF5MailImporterAkonadi ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG )
if (NOT WIN32)
set_package_properties(KPimItinerary PROPERTIES TYPE REQUIRED)
endif()
find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
set(GRANTLEE_LIB_VERSION "5.2.0")
......
add_subdirectory(bodypartformatter)
if(TARGET KPim::Itinerary)
add_subdirectory(grantlee)
endif()
add_subdirectory(grantlee)
......@@ -7,9 +7,7 @@ add_subdirectory(highlighter)
add_subdirectory(calendar)
add_subdirectory(gnupgwks)
add_subdirectory(pkpass)
if (TARGET KPim::Itinerary)
add_subdirectory(itinerary)
endif()
add_subdirectory(itinerary)
if (Qt5Widgets_VERSION VERSION_LESS 5.14.0)
set(USE_DISCOUNT_LIB TRUE)
......
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