Commit f2498146 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Remove NO_REGENERATE_MIME as now UPDATE_XDG_MIMETYPES uses -n

parent 4cc56b95
Pipeline #36106 passed with stage
in 28 minutes and 24 seconds
...@@ -105,8 +105,6 @@ option( ACCOUNTWIZARD_NO_GHNS "Disable GHNS support in the account wizard" FALSE ...@@ -105,8 +105,6 @@ option( ACCOUNTWIZARD_NO_GHNS "Disable GHNS support in the account wizard" FALSE
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
option( ACCOUNTWIZARD_NO_REGENERATE_MIME "Don't regenerate mime file (only for developper)" FALSE )
# config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
configure_file(src/config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-enterprise.h ) configure_file(src/config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-enterprise.h )
......
...@@ -82,9 +82,7 @@ install(TARGETS accountwizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ...@@ -82,9 +82,7 @@ install(TARGETS accountwizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS accountwizard_plugin DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(TARGETS accountwizard_plugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(PROGRAMS org.kde.accountwizard.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(PROGRAMS org.kde.accountwizard.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES accountwizard-mime.xml DESTINATION ${KDE_INSTALL_MIMEDIR}) install(FILES accountwizard-mime.xml DESTINATION ${KDE_INSTALL_MIMEDIR})
if (NOT ACCOUNTWIZARD_NO_REGENERATE_MIME) update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
endif()
add_subdirectory(wizards) add_subdirectory(wizards)
add_subdirectory(ispdb) add_subdirectory(ispdb)
......
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