From 660ae8182d53859998fb656b97127ca71ba2dea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 3 Nov 2013 17:00:06 +0100 Subject: Remaining parts of cmake conversion --- ConfigureChecks.cmake | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'ConfigureChecks.cmake') diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 8f1c622..1fedc9a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -15,7 +15,7 @@ if( WITH_GCC_VISIBILITY ) if( NOT UNIX ) - tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" ) + tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" ) endif( NOT UNIX ) set( __KDE_HAVE_GCC_VISIBILITY 1 ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") @@ -53,15 +53,40 @@ if( BUILD_KONQ_PLUGINS ) check_include_file( "sys/ioctl.h" HAVE_SYS_IOCTL_H ) check_include_file( "libutil.h" HAVE_LIBUTIL_H ) check_include_file( "util.h" HAVE_UTIL_H ) +endif( BUILD_KONQ_PLUGINS ) + + +##### other dependencies ######################## +if( BUILD_KONQ_PLUGINS OR BUILD_NOATUN_PLUGINS ) # arts if( WITH_ARTS ) pkg_search_module( ARTS arts ) if( NOT ARTS_FOUND ) - message( FATAL_ERROR "\naRts is requested, but was not found on your system" ) + tde_message_fatal( "aRts is requested, but was not found on your system" ) endif( ) endif( WITH_ARTS ) -endif( BUILD_KONQ_PLUGINS ) +endif( BUILD_KONQ_PLUGINS OR BUILD_NOATUN_PLUGINS ) + + +if( BUILD_NOATUN_PLUGINS ) + # sdl + if( WITH_SDL ) + pkg_search_module( SDL sdl ) + if( NOT SDL_FOUND ) + tde_message_fatal( "SDL is requested, but was not found on your system" ) + endif( ) + endif( WITH_SDL ) + + # berkeley db + if( WITH_BERKELEY_DB ) + find_path( BERKELEY_DB_INCLUDE_DIRS db_cxx.h ) + find_library( BERKELEY_DB_LIBS db_cxx ) + if( BERKELEY_DB_INCLUDE_DIRS-NOTFOUND OR BERKELEY_DB_LIBS-NOTFOUND ) + tde_message_fatal( "BerkeleyDB is requested, but was not found on your system" ) + endif( ) + endif( WITH_BERKELEY_DB ) +endif( BUILD_NOATUN_PLUGINS ) # required stuff -- cgit v1.2.1