Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: make Enchant required

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-08-11 23:26:12 +00:00
parent 69961c966f
commit 274eba82a6
5 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -70,6 +70,14 @@ set_package_properties(SharedMimeInfo PROPERTIES
PURPOSE "Allows KDE applications to determine file types" PURPOSE "Allows KDE applications to determine file types"
) )
find_package(ENCHANT)
set_package_properties(ENCHANT PROPERTIES
DESCRIPTION "Generic spell checking library"
URL "http://www.abisource.com/projects/enchant/"
TYPE REQUIRED
PURPOSE "Spell checking support via Enchant"
)
# optional features # optional features
if(X11_FOUND) if(X11_FOUND)
#X11_Xrender discovery is done by FindX11 #X11_Xrender discovery is done by FindX11

8
kdecore/CMakeLists.txt
View file

@ -73,14 +73,6 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/config-util.h ${CMAKE_CURRENT_BINARY_DIR}/config-util.h
) )
# Configure checks for sonnet
include(sonnet/ConfigureChecks.cmake)
configure_file(
sonnet/config-sonnet.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/sonnet/config-sonnet.h
)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/sonnet)
include_directories( include_directories(
${KDE4_KDECORE_INCLUDES} ${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES} ${KDE4_KDEUI_INCLUDES}

8
kdecore/sonnet/ConfigureChecks.cmake
View file

@ -1,8 +0,0 @@
macro_optional_find_package(ENCHANT)
set_package_properties(ENCHANT PROPERTIES
DESCRIPTION "Spell checking support via Enchant"
URL "http://www.abisource.com/projects/enchant/"
TYPE RECOMMENDED
)
macro_bool_to_01(ENCHANT_FOUND HAVE_ENCHANT)

3
kdecore/sonnet/config-sonnet.h.cmake
View file

@ -1,3 +0,0 @@
/* Set to 1 if you have enchant */
#cmakedefine01 HAVE_ENCHANT

3
kdecore/sonnet/loader.cpp
View file

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA * 02110-1301 USA
*/ */
#include "config-sonnet.h"
#include "loader_p.h" #include "loader_p.h"
#include "settings_p.h" #include "settings_p.h"
#include "enchantclient_p.h" #include "enchantclient_p.h"
@ -61,7 +60,6 @@ Loader::Loader()
KConfig config(QString::fromLatin1("sonnetrc")); KConfig config(QString::fromLatin1("sonnetrc"));
d->settings->restore(&config); d->settings->restore(&config);
#ifdef HAVE_ENCHANT
QSpellEnchantClient *client = new QSpellEnchantClient(this); QSpellEnchantClient *client = new QSpellEnchantClient(this);
d->clients.append(client->name()); d->clients.append(client->name());
@ -74,7 +72,6 @@ Loader::Loader()
d->languageClients[itr].prepend(client); d->languageClients[itr].prepend(client);
} }
} }
#endif // HAVE_ENCHANT
} }
Loader::~Loader() Loader::~Loader()