[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-bindings
Subject: [Kde-bindings] [PATCH] CMake configuration improvements
From: Arno Rehn <arno () arnorehn ! de>
Date: 2010-02-27 15:52:05
Message-ID: 201002271652.06157.arno () arnorehn ! de
[Download RAW message or body]
Hi,
Since the ENABLE_FOO variables in our CMake scripts became quite a mess now
that we have so many modules, I replaced them all with simple checks for
FOO_FOUND.
In the top-level CMakeLists.txt all packages are searched for with
macro_optional_find_package(). So if someone doesn't want to compile Nepomuk
or Soprano bindings, he can still simply disable them with -DWITH_Nepomuk=OFF
or -DWITH_Soprano=OFF.
I also added a nice feature log at the end of the configuration stage so that
the user knows which features are enabled and which are not.
Patch attached. Does anyone have objections or suggestions for improvements?
--
Arno Rehn
arno@arnorehn.de
["cmake_improvements.patch" (text/x-patch)]
Index: csharp/kimono/CMakeLists.txt
===================================================================
--- csharp/kimono/CMakeLists.txt (revision 1096694)
+++ csharp/kimono/CMakeLists.txt (working copy)
@@ -22,23 +22,25 @@
${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
# write FindPackage modules for these
-pkg_search_module(MONO mono)
+pkg_search_module(LIBMONO mono)
pkg_search_module(GLIB2 glib-2.0)
+macro_log_feature(LIBMONO_FOUND "libmono" "Mono library" \
"http://www.mono-project.com" FALSE "" "Required to compile kimonopluginfactory") +
# if libmono-dev is not installed, then MONO_INCLUDES is not defined and compiling
# the kimonopluginfactory would fail. So, just disable kimonopluginfactory if the
# MONO_INCLUDES is empty and provide some feedback to the user about it.
-IF (MONO_FOUND)
+IF (LIBMONO_FOUND)
SET(SRC_FACTORY src/kimonopluginfactory.cpp)
- LINK_DIRECTORIES(${MONO_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS})
- INCLUDE_DIRECTORIES(${MONO_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${LIBMONO_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS})
+ INCLUDE_DIRECTORIES(${LIBMONO_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS})
ADD_DEFINITIONS(${GLIB2_CFLAGS} ${MONO_CFLAGS})
KDE4_ADD_PLUGIN(kimonopluginfactory ${SRC_FACTORY})
- TARGET_LINK_LIBRARIES(kimonopluginfactory ${QT_QTCORE_LIBRARY} \
${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} qyotoshared smokeqtcore \
smokeqtgui ${MONO_LIBRARIES}) + TARGET_LINK_LIBRARIES(kimonopluginfactory \
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} \
qyotoshared smokeqtcore smokeqtgui ${LIBMONO_LIBRARIES})
INSTALL(TARGETS kimonopluginfactory DESTINATION ${PLUGIN_INSTALL_DIR})
-ELSE (MONO_FOUND)
+ELSE (LIBMONO_FOUND)
MESSAGE(STATUS "Mono not found. kimonopluginfactory will not be compiled.")
-ENDIF (MONO_FOUND)
+ENDIF (LIBMONO_FOUND)
CSHARP_ADD_LIBRARY(kde-dotnet "${SRC_CS}" REFERENCES qt-dotnet COMPILE_FLAGS /warn:0 \
/keyfile:${KEYFILE}) ADD_DEPENDENCIES (kde-dotnet qt-dotnet kimono)
Index: csharp/CMakeLists.txt
===================================================================
--- csharp/CMakeLists.txt (revision 1096694)
+++ csharp/CMakeLists.txt (working copy)
@@ -1,119 +1,58 @@
-OPTION(ENABLE_QYOTO "build Qyoto" ON)
-OPTION(ENABLE_QTSCRIPT_SHARP "build QtScript" ON)
-OPTION(ENABLE_QTTEST "build QtTest" ON)
-OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
-OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
-OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
-OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
-OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
-OPTION(ENABLE_KTEXTEDITOR_SHARP "build KTextEditor" ON)
-OPTION(ENABLE_KIMONO "build Kimono" ON)
-OPTION(ENABLE_QIMAGEBLITZ_SHARP "build QImageBlitzSharp" ON)
+enable_language(CSharp OPTIONAL)
-SET(QYOTO_ENABLED "no")
-SET(QTSCRIPT_ENABLED "no")
-set(QTTEST_ENABLED "no")
-SET(QTWEBKIT_ENABLED "no")
-SET(QTUITOOLS_ENABLED "no")
-SET(QTWEBKIT_ENABLED "no")
-SET(PHONON_SHARP_ENABLED "no")
-SET(QSCINTILLA_SHARP_ENABLED "no")
-SET(AKONADI_ENABLED "no")
-SET(KIMONO_ENABLED "no")
-SET(KHTML_SHARP_ENABLED "no")
-SET(KTEXTEDITOR_SHARP_ENABLED "no")
-SET(QIMAGEBLITZ_SHARP_ENABLED "no")
+macro_log_feature(CMAKE_CSharp_COMPILER_LOADED "C# compiler" "Mono or the .NET \
framework" "http://www.mono-project.com" FALSE "" "Required to compile the C# \
bindings")
+if (NOT CMAKE_CSharp_COMPILER_LOADED)
+ return()
+endif (NOT CMAKE_CSharp_COMPILER_LOADED)
+
SET(KEYFILE ${CMAKE_CURRENT_SOURCE_DIR}/key.snk)
SET( UICS_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/qyoto/tools/uics/uics )
SET( CSRCC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/qyoto/tools/csrcc/csrcc )
+
+add_subdirectory( qyoto )
+ADD_SUBDIRECTORY(qtscript)
+ADD_SUBDIRECTORY( qttest )
+ADD_SUBDIRECTORY(qtuitools)
+ADD_SUBDIRECTORY(qtwebkit)
+set(ENABLED_QYOTO_MODULES "Qyoto, QtScript, QtTest, QtUiTools, QtWebKit")
-if(ENABLE_QYOTO)
+IF(PHONON_FOUND)
+ ADD_SUBDIRECTORY(phonon)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, Phonon")
+ENDIF(PHONON_FOUND)
- enable_language(CSharp OPTIONAL)
+IF(QSCINTILLA_FOUND)
+ ADD_SUBDIRECTORY(qscintilla)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, QScintilla")
+ENDIF(QSCINTILLA_FOUND)
- IF (CMAKE_CSharp_COMPILER_LOADED)
- add_subdirectory( qyoto )
- set(QYOTO_ENABLED "yes")
+IF(KDE4_FOUND)
+ ADD_SUBDIRECTORY(kimono)
+ ADD_SUBDIRECTORY(khtml)
+ ADD_SUBDIRECTORY(ktexteditor)
+ ADD_SUBDIRECTORY(plasma)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, Kimono, KHTML, KTextEditor, \
Plasma") +ENDIF(KDE4_FOUND)
- IF(ENABLE_QTSCRIPT_SHARP)
- SET(QTSCRIPT_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(qtscript)
- ENDIF(ENABLE_QTSCRIPT_SHARP)
+IF(SOPRANO_FOUND)
+ ADD_SUBDIRECTORY(soprano)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, Soprano")
+ENDIF(SOPRANO_FOUND)
- IF(ENABLE_QTTEST)
- SET(QTTEST_ENABLED "yes")
- ADD_SUBDIRECTORY( qttest )
- ENDIF(ENABLE_QTTEST)
+IF(Nepomuk_FOUND)
+ ADD_SUBDIRECTORY(nepomuk)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, Nepomuk")
+ENDIF(Nepomuk_FOUND)
- IF(ENABLE_QTUITOOLS_SHARP)
- SET(QTUITOOLS_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(qtuitools)
- ENDIF(ENABLE_QTUITOOLS_SHARP)
+IF(QIMAGEBLITZ_FOUND)
+ ADD_SUBDIRECTORY(qimageblitz)
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, QImageBlitz")
+ENDIF(QIMAGEBLITZ_FOUND)
- IF(ENABLE_QTWEBKIT_SHARP)
- SET(QTWEBKIT_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(qtwebkit)
- ENDIF(ENABLE_QTWEBKIT_SHARP)
+if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+ add_subdirectory( akonadi )
+ set(ENABLED_QYOTO_MODULES "${ENABLED_QYOTO_MODULES}, Akonadi")
+endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- IF(ENABLE_PHONON_SHARP)
- SET(PHONON_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(phonon)
- ENDIF(ENABLE_PHONON_SHARP)
-
- IF(ENABLE_QSCINTILLA_SHARP AND QSCINTILLA_FOUND)
- FIND_PACKAGE(QScintilla REQUIRED)
- SET(QSCINTILLA_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(qscintilla)
- ENDIF(ENABLE_QSCINTILLA_SHARP AND QSCINTILLA_FOUND)
-
- IF(ENABLE_KIMONO)
- SET(KIMONO_ENABLED "yes")
- ADD_SUBDIRECTORY(kimono)
- ENDIF(ENABLE_KIMONO)
-
- IF(ENABLE_KHTML_SHARP)
- SET(KHTML_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(khtml)
- ENDIF(ENABLE_KHTML_SHARP)
-
- IF(ENABLE_KTEXTEDITOR_SHARP)
- SET(KTEXTEDITOR_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(ktexteditor)
- ENDIF(ENABLE_KTEXTEDITOR_SHARP)
-
- IF(Soprano_FOUND)
- SET(SOPRANO_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(soprano)
- ENDIF(Soprano_FOUND)
-
- IF(Nepomuk_FOUND)
- SET(NEPOMUK_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(nepomuk)
- ENDIF(Nepomuk_FOUND)
-
- IF(ENABLE_QIMAGEBLITZ_SHARP)
- SET(QIMAGEBLITZ_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(qimageblitz)
- ENDIF(ENABLE_QIMAGEBLITZ_SHARP)
-
- if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- add_subdirectory( akonadi )
- set(AKONADI_ENABLED "yes")
- endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-
- SET(PLASMA_SHARP_ENABLED "yes")
- ADD_SUBDIRECTORY(plasma)
-
- ENDIF (CMAKE_CSharp_COMPILER_LOADED)
-endif(ENABLE_QYOTO)
-
-message(STATUS "Build Qyoto... " ${QYOTO_ENABLED})
-message(STATUS "Build PhononSharp... " ${PHONON_SHARP_ENABLED})
-message(STATUS "Build QScintillaSharp... " ${QSCINTILLA_SHARP_ENABLED})
-message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
-message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
-message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
-message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
-message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
-message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})
+message(STATUS "Building Qyoto modules ${ENABLED_QYOTO_MODULES}")
Index: ruby/CMakeLists.txt
===================================================================
--- ruby/CMakeLists.txt (revision 1096694)
+++ ruby/CMakeLists.txt (working copy)
@@ -1,161 +1,81 @@
+set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+
macro_optional_find_package(Ruby)
-#####################################################################
-# QtRuby/Korundum
+if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+ set(COMPILE_RUBY TRUE CACHE INTERNAL "")
+endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
-OPTION(ENABLE_QTRUBY "build QtRuby" ON)
-OPTION(ENABLE_QTWEBKIT_RUBY "build QtWebKit" ON)
-OPTION(ENABLE_QTUITOOLS_RUBY "build QtUiTools" ON)
-OPTION(ENABLE_QTSCRIPT "build QtScript" ON)
-OPTION(ENABLE_QTTEST "build QtTest" ON)
+macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" \
"http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby bindings")
-OPTION(ENABLE_PHONON_RUBY "build Phonon" OFF)
-OPTION(ENABLE_QSCINTILLA_RUBY "build QScintilla" OFF)
-OPTION(ENABLE_QWT_RUBY "build Qwt" OFF)
-OPTION(ENABLE_SOPRANO_RUBY "build Soprano" OFF)
+if (NOT COMPILE_RUBY)
+ return()
+endif (NOT COMPILE_RUBY)
-OPTION(ENABLE_KDEVPLATFORM_RUBY "build KDevPlatform" OFF)
-OPTION(ENABLE_KORUNDUM_RUBY "build Korundum" ON)
-OPTION(ENABLE_KIO_RUBY "build KIO" ON)
-OPTION(ENABLE_KHTML_RUBY "build KHTML" ON)
-OPTION(ENABLE_KTEXTEDITOR_RUBY "build KTextEditor" ON)
-OPTION(ENABLE_SOLID_RUBY "build Solid" ON)
-OPTION(ENABLE_PLASMA_RUBY "build Plasma" ON)
-
SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation \
directory for ruby binary extension" ) SET(CUSTOM_RUBY_SITE_LIB_DIR \
${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-set(QTRUBY_ENABLED "no")
-set(QTWEBKIT_ENABLED "no")
-set(QTUITOOLS_ENABLED "no")
-set(QTSCRIPT_ENABLED "no")
-set(QTTEST_ENABLED "no")
+# compute an overall version number which can be compared at once
+MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + \
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
-set(PHONON_ENABLED "no")
-set(QSCINTILLA_ENABLED "no")
-set(QWT_ENABLED "no")
-set(SOPRANO_ENABLED "no")
+add_subdirectory( qtruby )
+add_subdirectory( qtwebkit )
+add_subdirectory( qtuitools )
+add_subdirectory( qtscript )
+add_subdirectory( qttest )
+set (ENABLED_RUBY_MODULES "Qt, QtWebKit, QtUiTools, QtScript, QtTest")
-set(AKONADI_ENABLED "no")
-set(KDEVPLATFORM_ENABLED "no")
-set(KORUNDUM_ENABLED "no")
-set(KIO_ENABLED "no")
-set(KHTML_ENABLED "no")
-set(KTEXTEDITOR_ENABLED "no")
-set(NEPOMUK_ENABLED "no")
-set(OKULAR_ENABLED "no")
-set(SOLID_ENABLED "no")
-set(PLASMA_ENABLED "no")
+if(PHONON_FOUND)
+ add_subdirectory( phonon )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Phonon")
+endif(PHONON_FOUND)
-if(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
+if(QSCINTILLA_FOUND)
+ add_subdirectory( qscintilla )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, QScintilla")
+endif(QSCINTILLA_FOUND)
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + \
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") +if(Qwt5_Qt4_FOUND)
+ add_subdirectory( qwt )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Qwt5")
+endif(Qwt5_Qt4_FOUND)
- if(ENABLE_QTRUBY)
- add_subdirectory( qtruby )
- set(QTRUBY_ENABLED "yes")
- endif(ENABLE_QTRUBY)
- if(ENABLE_QTWEBKIT_RUBY)
- add_subdirectory( qtwebkit )
- set(QTWEBKIT_ENABLED "yes")
- endif(ENABLE_QTWEBKIT_RUBY)
- if(ENABLE_QTUITOOLS_RUBY)
- add_subdirectory( qtuitools )
- set(QTUITOOLS_ENABLED "yes")
- endif(ENABLE_QTUITOOLS_RUBY)
- if(ENABLE_QTSCRIPT)
- add_subdirectory( qtscript )
- set(QTSCRIPT_ENABLED "yes")
- endif(ENABLE_QTSCRIPT)
- if(ENABLE_QTTEST)
- add_subdirectory( qttest )
- set(QTTEST_ENABLED "yes")
- endif(ENABLE_QTTEST)
+if(Soprano_FOUND)
+ add_subdirectory( soprano )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Soprano")
+endif(Soprano_FOUND)
- if(ENABLE_PHONON_RUBY AND PHONON_FOUND)
- add_subdirectory( phonon )
- set(PHONON_ENABLED "yes")
- endif(ENABLE_PHONON_RUBY AND PHONON_FOUND)
- if(ENABLE_QSCINTILLA_RUBY AND QSCINTILLA_FOUND)
- add_subdirectory( qscintilla )
- set(QSCINTILLA_ENABLED "yes")
- endif(ENABLE_QSCINTILLA_RUBY AND QSCINTILLA_FOUND)
- if(ENABLE_QWT_RUBY)
- add_subdirectory( qwt )
- set(QWT_ENABLED "yes")
- endif(ENABLE_QWT_RUBY)
-
- if(Soprano_FOUND)
- add_subdirectory( soprano )
- set(SOPRANO_ENABLED "yes")
- endif(Soprano_FOUND)
+if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+ add_subdirectory( akonadi )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Akonadi")
+endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- add_subdirectory( akonadi )
- set(AKONADI_ENABLED "yes")
- endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+if(KDE4_FOUND)
+ add_subdirectory( korundum )
+ add_subdirectory( kio )
+ add_subdirectory( khtml )
+ add_subdirectory( ktexteditor )
+ add_subdirectory( solid )
+ add_subdirectory( plasma )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, KDE4, KIO, KHTML, \
KTextEditor, Solid, Plasma") +endif(KDE4_FOUND)
- if(ENABLE_KORUNDUM_RUBY)
- add_subdirectory( korundum )
- set(KORUNDUM_ENABLED "yes")
- endif(ENABLE_KORUNDUM_RUBY)
-
- if(ENABLE_KIO_RUBY)
- add_subdirectory( kio )
- set(KIO_ENABLED "yes")
- endif(ENABLE_KIO_RUBY)
-
- if(KDEVPLATFORM_FOUND)
- add_subdirectory( kdevplatform )
- set(KDEVPLATFORM_ENABLED "yes")
- endif(KDEVPLATFORM_FOUND)
- if(ENABLE_KHTML_RUBY)
- add_subdirectory( khtml )
- set(KHTML_ENABLED "yes")
- endif(ENABLE_KHTML_RUBY)
- if(ENABLE_KTEXTEDITOR_RUBY)
- add_subdirectory( ktexteditor )
- set(KTEXTEDITOR_ENABLED "yes")
- endif(ENABLE_KTEXTEDITOR_RUBY)
- if(Nepomuk_FOUND)
- add_subdirectory( nepomuk )
- set(NEPOMUK_ENABLED "yes")
- endif(Nepomuk_FOUND)
- if(OKULAR_FOUND)
- add_subdirectory( okular )
- set(OKULAR_ENABLED "yes")
- endif(OKULAR_FOUND)
- if(ENABLE_PLASMA_RUBY)
- add_subdirectory( plasma )
- set(PLASMA_ENABLED "yes")
- endif(ENABLE_PLASMA_RUBY)
- if(ENABLE_SOLID_RUBY)
- add_subdirectory( solid )
- set(SOLID_ENABLED "yes")
- endif(ENABLE_SOLID_RUBY)
-endif(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
+if(KDEVPLATFORM_FOUND)
+ add_subdirectory( kdevplatform )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, KDevPlatform")
+endif(KDEVPLATFORM_FOUND)
-message(STATUS "Build QtRuby... " ${QTRUBY_ENABLED})
-message(STATUS "Build QtWebKit Ruby... " ${QTWEBKIT_ENABLED})
-message(STATUS "Build QtUiTools Ruby... " ${QTUITOOLS_ENABLED})
-message(STATUS "Build QtScript... " ${QTSCRIPT_ENABLED})
-message(STATUS "Build QtTest... " ${QTTEST_ENABLED})
+if(Nepomuk_FOUND)
+ add_subdirectory( nepomuk )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Nepomuk")
+endif(Nepomuk_FOUND)
-message(STATUS "Build Soprano Ruby... " ${SOPRANO_ENABLED})
-message(STATUS "Build QScintilla Ruby... " ${QSCINTILLA_ENABLED})
-message(STATUS "Build Qwt Ruby... " ${QWT_ENABLED})
-message(STATUS "Build Phonon Ruby... " ${PHONON_ENABLED})
+if(OKULAR_FOUND)
+ add_subdirectory( okular )
+ set(ENABLED_RUBY_MODULES "${ENABLED_RUBY_MODULES}, Okular")
+endif(OKULAR_FOUND)
-message(STATUS "Build Akonadi Ruby... " ${AKONADI_ENABLED})
-message(STATUS "Build KHTML Ruby... " ${KHTML_ENABLED})
-message(STATUS "Build Korundum... " ${KORUNDUM_ENABLED})
-message(STATUS "Build KDevPlatform Ruby... " ${KDEVPLATFORM_ENABLED})
-message(STATUS "Build KTextEditor Ruby... " ${KTEXTEDITOR_ENABLED})
-message(STATUS "Build Nepomuk Ruby... " ${NEPOMUK_ENABLED})
-message(STATUS "Build Okular Ruby... " ${OKULAR_ENABLED})
-message(STATUS "Build Plasma Ruby... " ${PLASMA_ENABLED})
-message(STATUS "Build Solid Ruby... " ${SOLID_ENABLED})
+message(STATUS "Building Ruby bindings for ${ENABLED_RUBY_MODULES}")
#####################################################################
# Kross Ruby
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 1096694)
+++ CMakeLists.txt (working copy)
@@ -10,50 +10,43 @@
include(KDE4Defaults)
include(MacroLibrary)
-# the MACRO_OPTIONAL_DEPEND_PACKAGE from KDE4 is broken
-macro (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed)
- set(_packagename Find${_name}.cmake)
- find_file(${_name}_PACKAGE_DEPEND_FOUND ${_packagename} PATHS \
${CMAKE_MODULE_PATH} )
- if(NOT ${_name}_PACKAGE_DEPEND_FOUND)
- MESSAGE(STATUS "cmake package ${_packagename} was not found. The package \
${_module_needed} is needed to compile all part of this program.")
- set(DEPEND_PACKAGE_${_name} FALSE)
- else(NOT ${_name}_PACKAGE_DEPEND_FOUND)
- set(DEPEND_PACKAGE_${_name} TRUE)
- endif(NOT ${_name}_PACKAGE_DEPEND_FOUND)
-endmacro (OUR_MACRO_OPTIONAL_DEPEND_PACKAGE)
-
-
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-macro_optional_find_package(OpenGL)
set(SOPRANO_MIN_VERSION "2.0")
+macro_optional_find_package(LibAttica)
+macro_log_feature(LIBATTICA_FOUND "libattica" "LibAttica" "http://www.kde.org" FALSE \
"" "Needed to compile libattica bindings") +
+macro_optional_find_package(QImageBlitz)
+macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "QImageBlitz library" \
"http://www.kde.org" FALSE "" "Needed to compile QImageBlitz bindings") +
+macro_optional_find_package(Qwt5)
+macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" \
"http://qwt.sourceforge.net" FALSE "" "Needed to compile Qwt5 bindings") +
+macro_optional_find_package(Phonon)
+macro_log_feature(PHONON_FOUND "Phonon" "Phonon multimedia framework" \
"http://www.kde.org" FALSE "" "Needed to compile Phonon bindings") +
macro_optional_find_package(Soprano)
+macro_log_feature(SOPRANO_FOUND "Soprano" "Soprano libraries" \
"http://soprano.sourceforge.net" FALSE "" "Needed to compile Soprano bindings") +
macro_optional_find_package(Nepomuk)
+macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Nepomuk libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Nepomuk bindings") +
macro_optional_find_package(KdepimLibs)
-macro_optional_find_package(QScintilla)
+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" \
"http://www.kde.org" FALSE "" "Needed to compile Akonadi bindings")
-# Look for Okular
-set( OKULAR_FOUND "no" )
-our_macro_optional_depend_package(Okular "Okular")
-if(DEPEND_PACKAGE_Okular)
- macro_optional_find_package(Okular)
-endif(DEPEND_PACKAGE_Okular)
+macro_optional_find_package(Akonadi)
+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Akonadi bindings")
-# Look for Akonadi
-our_macro_optional_depend_package(Akonadi "Akonadi")
-if(DEPEND_PACKAGE_Akonadi)
- macro_optional_find_package(Akonadi)
-endif(DEPEND_PACKAGE_Akonadi)
+macro_optional_find_package(QScintilla)
+macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries" \
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro" FALSE "" "Needed to \
compile QScintilla2 bindings")
-# Look for KDevelop
-set( KDEVPLATFORM_FOUND "no" )
-option(WITH_KDevPlatform "Search for KDevPlatform package" OFF)
-our_macro_optional_depend_package(KDevPlatform "KDevPlatform")
-if(DEPEND_PACKAGE_KDevPlatform)
- macro_optional_find_package(KDevPlatform)
-endif(DEPEND_PACKAGE_KDevPlatform)
+macro_optional_find_package(Okular)
+macro_log_feature(OKULAR_FOUND "Okular" "Okular libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Okular bindings")
+macro_optional_find_package(KDevPlatform)
+macro_log_feature(KDEVPLATFORM_FOUND "KDevPlatform" "KDevPlatform libraries" \
"http://www.kde.org" FALSE "" "Needed to compile KDevPlatform bindings") +
macro_optional_add_subdirectory(smoke)
macro_optional_add_subdirectory(ruby)
macro_optional_add_subdirectory(python)
Index: smoke/CMakeLists.txt
===================================================================
--- smoke/CMakeLists.txt (revision 1096694)
+++ smoke/CMakeLists.txt (working copy)
@@ -1,236 +1,134 @@
-OPTION(ENABLE_SMOKE "build Smoke" ON)
-OPTION(ENABLE_QTCORE_SMOKE "build QtCoreSmoke" ON)
-OPTION(ENABLE_QTNETWORK_SMOKE "build QtNetworkSmoke" ON)
-OPTION(ENABLE_QTDBUS_SMOKE "build QtDBusSmoke" ON)
-OPTION(ENABLE_QTGUI_SMOKE "build QtGuiSmoke" ON)
-OPTION(ENABLE_QTSVG_SMOKE "build QtSvgSmoke" ON)
-OPTION(ENABLE_QTSQL_SMOKE "build QtSqlSmoke" ON)
-OPTION(ENABLE_QTXML_SMOKE "build QtXmlSmoke" ON)
-OPTION(ENABLE_QTXMLPATTERNS_SMOKE "build QtXmlPatternsSmoke" ON)
-OPTION(ENABLE_QTOPENGL_SMOKE "build QtOpenGLSmoke" ON)
-OPTION(ENABLE_QTWEBKIT_SMOKE "build QtWebKitSmoke" ON)
-OPTION(ENABLE_QTSCRIPT_SMOKE "build QtScriptSmoke" ON)
-OPTION(ENABLE_QTUITOOLS_SMOKE "build QtUiToolsSmoke" ON)
-OPTION(ENABLE_QTTEST_SMOKE "build QtTestSmoke" ON)
-OPTION(ENABLE_QTMULTIMEDIA_SMOKE "build QtMultimediaSmoke" ON)
-OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" ON)
-OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" ON)
-OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
-OPTION(ENABLE_QIMAGEBLITZ_SMOKE "build QImageBlitzSmoke" ON)
-OPTION(ENABLE_KDE_SMOKE "build KDESmoke" ON)
-OPTION(ENABLE_KDECORE_SMOKE "build KDECoreSmoke" ON)
-OPTION(ENABLE_KDEUI_SMOKE "build KDEUiSmoke" ON)
-OPTION(ENABLE_KIO_SMOKE "build KIOSmoke" ON)
-OPTION(ENABLE_KPARTS_SMOKE "build KPartsSmoke" ON)
-OPTION(ENABLE_KFILE_SMOKE "build KFileSmoke" ON)
-OPTION(ENABLE_KNEWSTUFF2_SMOKE "build KNewStuff2" ON)
-OPTION(ENABLE_KNEWSTUFF3_SMOKE "build KNewStuff3" ON)
-OPTION(ENABLE_KUTILS_SMOKE "build KUtils" ON)
-OPTION(ENABLE_KDEVPLATFORM_SMOKE "build KDevPlatformSmoke" OFF)
-OPTION(ENABLE_KHTML_SMOKE "build KHTMLSmoke" ON)
-OPTION(ENABLE_KTEXTEDITOR_SMOKE "build KTextEditorSmoke" ON)
-OPTION(ENABLE_SOLID_SMOKE "build SolidSmoke" ON)
-OPTION(ENABLE_PLASMA_SMOKE "build PlasmaSmoke" ON)
-OPTION(ENABLE_ATTICA_SMOKE "build AtticaSmoke" ON)
+add_definitions(-DSMOKE_BUILDING)
+add_subdirectory(qt)
+set(SMOKE_ENABLED "yes - Qt")
-set(SMOKE_ENABLED "no")
-if(ENABLE_SMOKE)
- add_definitions(-DSMOKE_BUILDING)
- add_subdirectory(qt)
- set(SMOKE_ENABLED "yes - Qt")
+add_subdirectory(qtcore)
+add_subdirectory(deptool)
+add_subdirectory(smokeapi)
- if(ENABLE_QTCORE_SMOKE)
- add_subdirectory(qtcore)
- add_subdirectory(deptool)
- add_subdirectory(smokeapi)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtCore")
- endif(ENABLE_QTCORE_SMOKE)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtCore")
+add_subdirectory(qtnetwork)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtNetwork")
+add_subdirectory(qtdbus)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtDBus")
+add_subdirectory(qtgui)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtGui")
+add_subdirectory(qtsvg)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtSvg")
+add_subdirectory(qtsql)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtSql")
+add_subdirectory(qtxml)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtXml")
+add_subdirectory(qtxmlpatterns)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtXmlPatterns")
+add_subdirectory(qtopengl)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtOpenGL")
+add_subdirectory(qtwebkit)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtWebKit")
+add_subdirectory(qtscript)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtScript")
+add_subdirectory(qtuitools)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtUiTools")
+add_subdirectory(qttest)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtTest")
+add_subdirectory(qtmultimedia)
+set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtMultimedia")
- if(ENABLE_QTNETWORK_SMOKE)
- add_subdirectory(qtnetwork)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtNetwork")
- endif(ENABLE_QTNETWORK_SMOKE)
+if(PHONON_FOUND)
+ add_subdirectory(phonon)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Phonon")
+endif(PHONON_FOUND)
- if(ENABLE_QTDBUS_SMOKE)
- add_subdirectory(qtdbus)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtDBus")
- endif(ENABLE_QTDBUS_SMOKE)
+if(QSCINTILLA_FOUND)
+ add_subdirectory(qsci)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, QScintilla2")
+endif(QSCINTILLA_FOUND)
- if(ENABLE_QTGUI_SMOKE)
- add_subdirectory(qtgui)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtGui")
- endif(ENABLE_QTGUI_SMOKE)
+if(Qwt5_Qt4_FOUND)
+ add_subdirectory(qwt)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Qwt")
+endif(Qwt5_Qt4_FOUND)
- if(ENABLE_QTSVG_SMOKE)
- add_subdirectory(qtsvg)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtSvg")
- endif(ENABLE_QTSVG_SMOKE)
+if(QIMAGEBLITZ_FOUND)
+ add_subdirectory(qimageblitz)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, QImageBlitz")
+endif(QIMAGEBLITZ_FOUND)
- if(ENABLE_QTSQL_SMOKE)
- add_subdirectory(qtsql)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtSql")
- endif(ENABLE_QTSQL_SMOKE)
+if(KDE4_FOUND)
+ add_subdirectory(kde)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDE")
- if(ENABLE_QTXML_SMOKE)
- add_subdirectory(qtxml)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtXml")
- endif(ENABLE_QTXML_SMOKE)
+ add_subdirectory(kdecore)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDECore")
- if(ENABLE_QTXMLPATTERNS_SMOKE)
- add_subdirectory(qtxmlpatterns)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtXmlPatterns")
- endif(ENABLE_QTXMLPATTERNS_SMOKE)
+ add_subdirectory(kdeui)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDEUi")
- if(ENABLE_QTOPENGL_SMOKE)
- add_subdirectory(qtopengl)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtOpenGL")
- endif(ENABLE_QTOPENGL_SMOKE)
+ add_subdirectory(kio)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KIO")
- if(ENABLE_QTWEBKIT_SMOKE)
- add_subdirectory(qtwebkit)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtWebKit")
- endif(ENABLE_QTWEBKIT_SMOKE)
+ add_subdirectory(kparts)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KParts")
- if(ENABLE_QTSCRIPT_SMOKE)
- add_subdirectory(qtscript)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtScript")
- endif(ENABLE_QTSCRIPT_SMOKE)
+ add_subdirectory(kfile)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KFile")
- if(ENABLE_QTUITOOLS_SMOKE)
- add_subdirectory(qtuitools)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtUiTools")
- endif(ENABLE_QTUITOOLS_SMOKE)
+ add_subdirectory(knewstuff2)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KNewStuff2")
- if(ENABLE_QTTEST_SMOKE)
- add_subdirectory(qttest)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtTest")
- endif(ENABLE_QTTEST_SMOKE)
+ add_subdirectory(knewstuff3)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KNewStuff3")
- if(ENABLE_QTMULTIMEDIA_SMOKE)
- add_subdirectory(qtmultimedia)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtMultimedia")
- endif(ENABLE_QTMULTIMEDIA_SMOKE)
+ add_subdirectory(kutils)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KUtils")
- if(ENABLE_PHONON_SMOKE AND PHONON_FOUND)
- add_subdirectory(phonon)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Phonon")
- endif(ENABLE_PHONON_SMOKE AND PHONON_FOUND)
+ add_subdirectory(khtml)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
- if(ENABLE_QSCI_SMOKE AND QSCINTILLA_FOUND)
- add_subdirectory(qsci)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QScintilla2")
- endif(ENABLE_QSCI_SMOKE AND QSCINTILLA_FOUND)
+ add_subdirectory(ktexteditor)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
- if(ENABLE_QWT_SMOKE)
- add_subdirectory(qwt)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Qwt")
- endif(ENABLE_QWT_SMOKE)
- if(ENABLE_QIMAGEBLITZ_SMOKE)
- add_subdirectory(qimageblitz)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, QImageBlitz")
- endif(ENABLE_QIMAGEBLITZ_SMOKE)
+ add_subdirectory(solid)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Solid")
+ add_subdirectory(plasma)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Plasma")
- if(ENABLE_SOLID_SMOKE)
- add_subdirectory(solid)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Solid")
- endif(ENABLE_SOLID_SMOKE)
+endif(KDE4_FOUND)
- if(Soprano_FOUND)
- add_subdirectory(soprano)
- add_subdirectory(sopranoclient)
- add_subdirectory(sopranoserver)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Soprano")
- endif(Soprano_FOUND)
+if(Soprano_FOUND)
+ add_subdirectory(soprano)
+ add_subdirectory(sopranoclient)
+ add_subdirectory(sopranoserver)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Soprano")
+endif(Soprano_FOUND)
- if(ENABLE_PLASMA_SMOKE)
- add_subdirectory(plasma)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Plasma")
- endif(ENABLE_PLASMA_SMOKE)
+if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+ add_subdirectory(akonadi)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
+endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- if(ENABLE_KDE_SMOKE)
- add_subdirectory(kde)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDE")
- endif(ENABLE_KDE_SMOKE)
+if(KDEVPLATFORM_FOUND)
+ add_subdirectory(kdevplatform)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDevPlatform")
+endif(KDEVPLATFORM_FOUND)
- if(ENABLE_KDECORE_SMOKE)
- add_subdirectory(kdecore)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDECore")
- endif(ENABLE_KDECORE_SMOKE)
+if(LIBATTICA_FOUND)
+ add_subdirectory(attica)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Attica")
+endif(LIBATTICA_FOUND)
- if(ENABLE_KDEUI_SMOKE)
- add_subdirectory(kdeui)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDEUi")
- endif(ENABLE_KDEUI_SMOKE)
+if(Nepomuk_FOUND)
+ add_subdirectory(nepomuk)
+ add_subdirectory(nepomukquery)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
+endif(Nepomuk_FOUND)
- if(ENABLE_KIO_SMOKE)
- add_subdirectory(kio)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KIO")
- endif(ENABLE_KIO_SMOKE)
+if(OKULAR_FOUND)
+ add_subdirectory(okular)
+ set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
+endif(OKULAR_FOUND)
- if(ENABLE_KPARTS_SMOKE)
- add_subdirectory(kparts)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KParts")
- endif(ENABLE_KPARTS_SMOKE)
-
- if(ENABLE_KFILE_SMOKE)
- add_subdirectory(kfile)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KFile")
- endif(ENABLE_KFILE_SMOKE)
-
- if(ENABLE_KNEWSTUFF2_SMOKE)
- add_subdirectory(knewstuff2)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KNewStuff2")
- endif(ENABLE_KNEWSTUFF2_SMOKE)
-
- if(ENABLE_KNEWSTUFF3_SMOKE)
- add_subdirectory(knewstuff3)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KNewStuff3")
- endif(ENABLE_KNEWSTUFF3_SMOKE)
-
- if(ENABLE_KUTILS_SMOKE)
- add_subdirectory(kutils)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KUtils")
- endif(ENABLE_KUTILS_SMOKE)
-
- if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- add_subdirectory(akonadi)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
- endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-
- if(ENABLE_KDEVPLATFORM_SMOKE)
- add_subdirectory(kdevplatform)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDevPlatform")
- endif(ENABLE_KDEVPLATFORM_SMOKE)
-
- if(ENABLE_KHTML_SMOKE)
- add_subdirectory(khtml)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
- endif(ENABLE_KHTML_SMOKE)
-
- if(ENABLE_KTEXTEDITOR_SMOKE)
- add_subdirectory(ktexteditor)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
- endif(ENABLE_KTEXTEDITOR_SMOKE)
-
- if(ENABLE_ATTICA_SMOKE)
- add_subdirectory(attica)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Attica")
- endif(ENABLE_ATTICA_SMOKE)
-
- if(Nepomuk_FOUND)
- add_subdirectory(nepomuk)
- add_subdirectory(nepomukquery)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
- endif(Nepomuk_FOUND)
-
- if(OKULAR_FOUND)
- add_subdirectory(okular)
- set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
- endif(OKULAR_FOUND)
-
-endif(ENABLE_SMOKE)
-
# for qtguess.pl
if (APPLE)
set(qt_test_threshold 15)
_______________________________________________
Kde-bindings mailing list
Kde-bindings@kde.org
https://mail.kde.org/mailman/listinfo/kde-bindings
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic