diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-14 08:14:51 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-14 08:14:51 -0500 |
| commit | f34a07c4a304852c8569fa97eaa5c1f360177564 (patch) | |
| tree | 7078979a4a14ca20460996aceca494437482a649 | |
| parent | d50125d0ec338d7b488f444d128c0ab92fff1cc5 (diff) | |
| download | tdebase-f34a07c4a304852c8569fa97eaa5c1f360177564.tar.gz tdebase-f34a07c4a304852c8569fa97eaa5c1f360177564.zip | |
Fix FTBFS when WITH_HAL=OFF.
| -rw-r--r-- | ConfigureChecks.cmake | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1d9c83d71..bbca289d4 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -268,22 +268,20 @@ if( BUILD_TDM OR BUILD_KSMSERVER ) tde_message_fatal( "dbus-tqt-1 is required, but was not found on your system" ) endif( ) endif( ) - if( WITH_HAL ) - # check for dbus-tqt - # dbus-tqt need Qt flags - pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) - tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) - set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) - check_cxx_source_compiles(" - #include <tqt.h> - #include <dbus/connection.h> - int main(int, char**) { return 0; } " - HAVE_DBUS_QT3_07 ) - tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - if( NOT HAVE_DBUS_QT3_07 ) - tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) - endif( ) + # check for dbus-tqt + # dbus-tqt need Qt flags + pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) + tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) + set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) + check_cxx_source_compiles(" + #include <tqt.h> + #include <dbus/connection.h> + int main(int, char**) { return 0; } " + HAVE_DBUS_QT3_07 ) + tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + if( NOT HAVE_DBUS_QT3_07 ) + tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) endif( ) endif( ) |